Merge branch 'master' into japanese
drwxr-xr-x moose-class