Merge branch 'master' into develop
touchup work
Merge branch 'release/release-1-21-2014_1_5_2'