Merge with rowan-m-feature/use-phpunit-data-providers (pull request #2)