Clang 3.3 Debug: In file included from warning: extra ';' outside of a function is a C++11 extension [-Wc++11-extra-semi]
Merge branch 'FlorianRudolf/fix-compiler-errors-and-warnings' into next