Merge branch 'master' into no-glib

This commit is contained in:
Evan Miller
2020-08-05 19:49:25 -04:00