Updated to 1.7.4
Merge branch 'master' into develop