Merge branch 'hotfix/2014.04.24.1'