CM7.2: CYAN-1602

This will fix issue 11.