cosp
Merge branch 'hotfix/20140602-cosp'