Fix a couple of test cases due to changes in xdebug (i assume at least)
Merge remote branch 'upstream/3.7' into 3.7