Merge "gcc 4.7 cleanups"