Review main Merged

14091[BUGFIX] Fix frontend unit tests

Wouter Wolters CR +2 V +2 Normal +91 −116 updated 06/03/13, 20:49