Update PHPUnit to version 4.1.1

Closes #1174
Merge remote-tracking branch 'upstream/master'