Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor
2019-04-25 20:54:23 +01:00