Merge branch 'v0.16'

author Dan Brown <redacted>

Sun, 23 Apr 2017 19:40:32 +0000 (20:40 +0100)

committer Dan Brown <redacted>

Sun, 23 Apr 2017 19:40:32 +0000 (20:40 +0100)
author Dan Brown <redacted>
Sun, 23 Apr 2017 19:40:32 +0000 (20:40 +0100)
committer Dan Brown <redacted>
Sun, 23 Apr 2017 19:40:32 +0000 (20:40 +0100)
diff --cc themes/bookstack/layouts/blog/single.html
Simple merge
author	Dan Brown <redacted>
	Sun, 23 Apr 2017 19:40:32 +0000 (20:40 +0100)
committer	Dan Brown <redacted>
	Sun, 23 Apr 2017 19:40:32 +0000 (20:40 +0100)