Merge branch 'master' into release

author Dan Brown <redacted>

Sun, 23 Apr 2017 19:41:45 +0000 (20:41 +0100)

committer Dan Brown <redacted>

Sun, 23 Apr 2017 19:41:45 +0000 (20:41 +0100)
author Dan Brown <redacted>
Sun, 23 Apr 2017 19:41:45 +0000 (20:41 +0100)
committer Dan Brown <redacted>
Sun, 23 Apr 2017 19:41:45 +0000 (20:41 +0100)
diff --cc version

index d5bd67d22fba41bcbdf04bdbe981696dcc061e91,973dcf5ace09ec3bce7c944761459a4785241871..39fa1765f914359db1fb60e1596b6107f7ea177a
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.15.3
- -v0.16-dev
++v0.16
author	Dan Brown <redacted>
	Sun, 23 Apr 2017 19:41:45 +0000 (20:41 +0100)
committer	Dan Brown <redacted>
	Sun, 23 Apr 2017 19:41:45 +0000 (20:41 +0100)