Merge "Fix gcc-4.6 warnings."