Removing branch alias.
Upgrades phpunit.
Merge branch 'master' into 1.0