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

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