Merge branch 'master' into release, Updated version

author Dan Brown <redacted>

Fri, 6 Oct 2017 20:04:49 +0000 (21:04 +0100)

committer Dan Brown <redacted>

Fri, 6 Oct 2017 20:05:45 +0000 (21:05 +0100)
author Dan Brown <redacted>
Fri, 6 Oct 2017 20:04:49 +0000 (21:04 +0100)
committer Dan Brown <redacted>
Fri, 6 Oct 2017 20:05:45 +0000 (21:05 +0100)
diff --cc version

index c3990df253d95643653840888bf86a3105f00675,de0ad77915bab6a1a85aa60ba37a325637f2ada4..131c55b2ca2d41e41d13daed53d5734ad6da47dd
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.18.2
- -v0.18-dev
++v0.18.3
author	Dan Brown <redacted>
	Fri, 6 Oct 2017 20:04:49 +0000 (21:04 +0100)
committer	Dan Brown <redacted>
	Fri, 6 Oct 2017 20:05:45 +0000 (21:05 +0100)