Merge release into master - post hotfix-2014-09-19-1