Fix the GCC 4.6 build with a specific patch for the virtual "override" specifier
Merge branch 'fix-gcc-46-build' into develop