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

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_290.php
	library/startup.php
	tests/db/UpgradeDBTest.php