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

# Conflicts:
#	VERSIONS
#	cosmogramme/php/integration/pseudo_notices.php
#	cosmogramme/php/integre_traite_main.php
#	library/startup.php