Merge branch 'master' into utf32-update

This is an "ours" merge which ignores the changes from master. This is
because this utf32-update branch should supersede the old development
from master, and this will allow merging our branch into master.

Author: ridiculousfish