Merge branch 'master', remote-tracking branch 'yoshiro/master'
seminor work