Merge branch 'hotfix/20140422-pachi'
nefficient
Merge branch 'hotfix/20140421-nefficent.jp' into develop