Merge branch 'bugfix/build-failure-on-i386' into 'master'

Ansgar Burchardtrequested to merge
cherry-pick-1318e0e3 into releases/2.5

Use correct type for second template argument of std::array

See merge request !90 (merged)

Merge request reports