Fix test on Mac (\D shows up)
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'