Merge remote-tracking branch 'upstream/develop' into 1610-performance

author Michael <heluecht@pirati.ca>

Tue, 25 Oct 2016 16:16:01 +0000 (16:16 +0000)

committer Michael <heluecht@pirati.ca>

Tue, 25 Oct 2016 16:16:01 +0000 (16:16 +0000)
author Michael <heluecht@pirati.ca>
Tue, 25 Oct 2016 16:16:01 +0000 (16:16 +0000)
committer Michael <heluecht@pirati.ca>
Tue, 25 Oct 2016 16:16:01 +0000 (16:16 +0000)
diff --cc boot.php
Simple merge
diff --cc doc/htconfig.md
Simple merge
diff --cc include/Core/PConfig.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Tue, 25 Oct 2016 16:16:01 +0000 (16:16 +0000)
committer	Michael <heluecht@pirati.ca>
	Tue, 25 Oct 2016 16:16:01 +0000 (16:16 +0000)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
doc/htconfig.md	patch \|	diff1 \|	diff2 \|	blob \| history
include/Core/PConfig.php	patch \|	diff1 \|	diff2 \|	blob \| history