Fix whitespace
Add missing annotation
Fix whitespace
Fix docblocks
Refactor the handling of the @beforeClass, @before, @after, @afterClass annotations to close #1186 and probably solve other issues (in process isolation, for instance)
Merge branch '4.0'