Make sure error reporting is on for phpunit
Merge branch 'develop' into userpage