Merge pull request #110 from TeamMentor/master

syncing 3.4 master with 3.4_Release
Merge pull request #111 from TeamMentor/3.4_Release

making final 3.4 commit in master (synced with 3.4_Release branch)