Merge branch 'stable' with changes

This commit is contained in:
Dylan K. Taylor
2019-11-09 18:01:04 +00:00
15 changed files with 242 additions and 25 deletions