BUG Allow PHPUnit installation with composer / Fix travis
Merge pull request #3088 from tractorcow/pulls/3.1-phpunit

BUG Allow PHPUnit installation with composer / Fix travis