Fix test suite failure on GCC 4.8, take three
Merge branch 'maint'

* maint:
  Fix test suite failure on GCC 4.8, take three