Merge branch 'master' into release

author Dan Brown <redacted>

Mon, 3 Feb 2020 22:43:58 +0000 (22:43 +0000)

committer Dan Brown <redacted>

Mon, 3 Feb 2020 22:43:58 +0000 (22:43 +0000)
author Dan Brown <redacted>
Mon, 3 Feb 2020 22:43:58 +0000 (22:43 +0000)
committer Dan Brown <redacted>
Mon, 3 Feb 2020 22:43:58 +0000 (22:43 +0000)
diff --cc .gitignore
Simple merge
diff --cc version

index 20be51f0864e6b7f9367c3eb91943b00a0bb1793,d400403770b07fdcd3eb850c6b28c62b7c1a5d83..31950dacac48d384d8fefc834dbac63cee78d9c2
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.27.5
- -v0.28-dev
++v0.28.0
author	Dan Brown <redacted>
	Mon, 3 Feb 2020 22:43:58 +0000 (22:43 +0000)
committer	Dan Brown <redacted>
	Mon, 3 Feb 2020 22:43:58 +0000 (22:43 +0000)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
version	patch \|	diff1 \|	diff2 \|	blob \| history