d0c5ef5
0a395cf
last part only needed for 2.2, but shouldn't harm in master, we're using double braces on other places too when initializing a std::array