Merge remote-tracking branch 'hsaito/master' into next