fix for https://github.com/TeamMentor/TM_4_0_Design/issues/154#issuecomment-67612533
Merge commit 'd2bd3c512d36e9355c1c8aa9b4bb4930ee31c681'