master4
master5
rbase
Revert "master5"

This reverts commit b3ef123dc35d7b281198797fba63c0829fc87629.
Merge branch 'rbase' of github_ko-taro-:ko-taro-/aki into rbase