Don't force PHPDoc's in *Test.php files
Merge branch 'master' into in-portal