Merge hotfix-2014-08-29 to master