FIX: Compile error on GCC (some versions)
Merge branch '11.x'