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