Fixing Issue https://github.com/TeamMentor/Master/issues/826
Fix for https://github.com/TeamMentor/Master/issues/826
Merge branch 'michaelhidalgo-3.5_RC_2' into 3.5_RC_2