Merge branch 'hotfix/2014.04.24.1'
Merge branch 'master' into develop