Merge branch 'master' into unicode-support

This commit is contained in:
Dean Herbert
2017-02-09 15:48:37 +09:00