Merge branch 'master' into release

author Dan Brown <redacted>

Sun, 20 Sep 2020 09:30:10 +0000 (10:30 +0100)

committer Dan Brown <redacted>

Sun, 20 Sep 2020 09:30:10 +0000 (10:30 +0100)
author Dan Brown <redacted>
Sun, 20 Sep 2020 09:30:10 +0000 (10:30 +0100)
committer Dan Brown <redacted>
Sun, 20 Sep 2020 09:30:10 +0000 (10:30 +0100)
diff --combined version

index e22b5a597f76bdb7b9ce8c40cab8045ccfeb4d5c,31c2e1d4bb4cfcb6f9e5c7e394aa225b0664fd2e..9388ecbd52f057369df5e2cdb26ebfbe7a6c95da
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.29.3
- -v0.30-dev
++v0.30.0
author	Dan Brown <redacted>
	Sun, 20 Sep 2020 09:30:10 +0000 (10:30 +0100)
committer	Dan Brown <redacted>
	Sun, 20 Sep 2020 09:30:10 +0000 (10:30 +0100)