Review main Merged

10187[BUGFIX] Fix the unit tests to work with PHPUnit 3.6

Oliver Klee CR +2 V +2 Normal +64 −30 updated 06/03/13, 20:49