TeamMentor/Master — pull request #611 by DinisCruz (2013-10-02 13:55:13+00:00)
Title: 3.4 merge

This is the 3.4 changes since 3.3.3 release