More work on Prophecy support
Merge branch 'master' of git://github.com/sebastianbergmann/phpunit