Merge "quake: Fix build with gcc 4.8"