Merge branch 'hotfix/20140901-otatama'
osu
Merge branch 'hotfix/20140901-osu' into develop