Merge bugfixes from branch 'v0.14'

author Dan Brown <redacted>

Sun, 5 Feb 2017 21:24:15 +0000 (21:24 +0000)

committer Dan Brown <redacted>

Sun, 5 Feb 2017 21:24:15 +0000 (21:24 +0000)
author Dan Brown <redacted>
Sun, 5 Feb 2017 21:24:15 +0000 (21:24 +0000)
committer Dan Brown <redacted>
Sun, 5 Feb 2017 21:24:15 +0000 (21:24 +0000)
diff --cc app/helpers.php
Simple merge
diff --cc tests/PublicActionTest.php
Simple merge
author	Dan Brown <redacted>
	Sun, 5 Feb 2017 21:24:15 +0000 (21:24 +0000)
committer	Dan Brown <redacted>
	Sun, 5 Feb 2017 21:24:15 +0000 (21:24 +0000)
		1	2
app/helpers.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/PublicActionTest.php	patch \|	diff1 \|	diff2 \|	blob \| history