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

author Michael Vogel <icarus@dabo.de>

Tue, 26 Jul 2016 20:16:37 +0000 (22:16 +0200)

committer Michael Vogel <icarus@dabo.de>

Tue, 26 Jul 2016 20:16:37 +0000 (22:16 +0200)
author Michael Vogel <icarus@dabo.de>
Tue, 26 Jul 2016 20:16:37 +0000 (22:16 +0200)
committer Michael Vogel <icarus@dabo.de>
Tue, 26 Jul 2016 20:16:37 +0000 (22:16 +0200)
diff --cc boot.php
Simple merge
diff --cc mod/contacts.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Tue, 26 Jul 2016 20:16:37 +0000 (22:16 +0200)
committer	Michael Vogel <icarus@dabo.de>
	Tue, 26 Jul 2016 20:16:37 +0000 (22:16 +0200)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/contacts.php	patch \|	diff1 \|	diff2 \|	blob \| history