Finishing 3.4
Merge branch 'master' of https://github.com/Fredrik89/mt