Merge branch 'hotfix/20140901-emu'
777.nifty.com
Merge branch 'hotfix/20140901-777nifty' into develop