Merge branch 'hotfix/2013-08-18'
Merge branch 'master' into develop