fix unit test (should work with phpunit >= 4.2)
Merge branch 'master' into custom