Merge pull request #160 from Alexpux/develop

Backport patch for GCC Bug 55171 to GCC 4.7.2