Merge branch 'stable' into next-minor

This commit is contained in:
Dylan K. Taylor
2019-11-29 11:55:12 +00:00