FIX: Compile error with MinGW
FIX: Further compile error with (some versions of) GCC
Merge branch '11.x'