Merge branch 'master' into release

author Dan Brown <redacted>

Mon, 27 Feb 2017 14:57:38 +0000 (14:57 +0000)

committer Dan Brown <redacted>

Mon, 27 Feb 2017 14:57:38 +0000 (14:57 +0000)
author Dan Brown <redacted>
Mon, 27 Feb 2017 14:57:38 +0000 (14:57 +0000)
committer Dan Brown <redacted>
Mon, 27 Feb 2017 14:57:38 +0000 (14:57 +0000)
diff --cc version

index 31b7b31986995c7fb6fd96e454ae4b7ea1e791be,c7f762861ccd51ccbe6920cdee90c1993d353988..c06eba1aa9e6e636ce9714e229e23b9a2e3194b4
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.14.3
- -v0.15-dev
++v0.15.0
author	Dan Brown <redacted>
	Mon, 27 Feb 2017 14:57:38 +0000 (14:57 +0000)
committer	Dan Brown <redacted>
	Mon, 27 Feb 2017 14:57:38 +0000 (14:57 +0000)