Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."