osu
Merge branch 'hotfix/20140901-osu'