Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object...

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/follow.php

diff --cc include/Contact.php
Simple merge

diff --cc include/cron.php
Simple merge

diff --cc include/follow.php
Simple merge

diff --cc include/user.php
Simple merge

diff --cc mod/install.php
Simple merge