Merge branch 'maint'

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

Conflicts:
	test.sh

diff --cc test.sh
index 8c52b12d675c442e7d98b05cb240159a24c5ca70,18bea944d5f8711577cdb282d6d93dd16bfcbd53..e74792da08eaa3dbc546758d253659ca782b0148
--- 1/test.sh
--- 2/test.sh
+++ b/test.sh
@@@ -848,9 -704,7 +851,9 @@@ EO
      checkstat 'cache hit (direct)' 0
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "$expected_d_content"
+     checkfile other.d "$expected_mmd_d_content"
 +    CCACHE_DISABLE=1 $COMPILER -c -Wp,-MMD,other.d test.c -o reference_test.o
 +    compare_file reference_test.o test.o
  
      rm -f other.d
  
@@@ -858,8 -712,7 +861,8 @@@
      checkstat 'cache hit (direct)' 1
      checkstat 'cache hit (preprocessed)' 0
      checkstat 'cache miss' 1
-     checkfile other.d "$expected_d_content"
+     checkfile other.d "$expected_mmd_d_content"
 +    compare_file reference_test.o test.o
  
      rm -f other.d