Merge "Workaround g++ 4.7 compfail"