Merge branch 'master' into fix-mania-conversion

This commit is contained in:
Dean Herbert
2018-03-09 21:39:19 +09:00
committed by GitHub