Merge branch 'master' into release

author Dan Brown <redacted>

Tue, 7 May 2019 22:05:10 +0000 (23:05 +0100)

committer Dan Brown <redacted>

Tue, 7 May 2019 22:05:10 +0000 (23:05 +0100)
author Dan Brown <redacted>
Tue, 7 May 2019 22:05:10 +0000 (23:05 +0100)
committer Dan Brown <redacted>
Tue, 7 May 2019 22:05:10 +0000 (23:05 +0100)
diff --combined version

index eaf8bae7065cda866c863274e10efc9f62848ee3,a361484193e655a868708275458bacbb55113650..332a47bc8716e87198ba17e5eb2439f64d329eb4
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.26.0
- -v0.26-dev
++v0.26.1
author	Dan Brown <redacted>
	Tue, 7 May 2019 22:05:10 +0000 (23:05 +0100)
committer	Dan Brown <redacted>
	Tue, 7 May 2019 22:05:10 +0000 (23:05 +0100)