Missing comma
Merge branch 'hotfix1-2014-05' into beta