Merge branch 'hotfix/20140515-general-fixes'
Merge branch 'develop'