#23: phpunit upgraded to 4.*
Merge remote-tracking branch 'origin/master' into issue_7