Review main Merged

12500[TASK] Fix CGL violations against InlineControlStructure

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