Dylan K. Taylor 55f8314fa7 Merge branch 'next-minor'
# Conflicts:
#	resources/vanilla
2020-05-18 20:33:22 +01:00
..
2020-05-18 20:33:22 +01:00