Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2020-11-26 21:09:17 -06:00
commit 1ec3efa04b