TeamMentor/Dev — pull request #111 by DinisCruz (2013-09-30 19:02:44+00:00)
Title: making final 3.4 commit in master (synced with 3.4_Release branch)

syncing 3.4 master with 3.4_Release