Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread