Fix for GCC 4.8.x

    GCC 4.8.x has the same bug as GCC 4.7.x
    This expands the earlier fix to cover all 4.8.x versions

Change-Id: I4b777115e79dcc9f1e4085d38ff92b014955f078