Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/startup.php