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

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

Conflicts:
	test.sh