Merge branch 'hotfix/20140602-adok'
cosp
Merge branch 'hotfix/20140602-cosp' into develop