Merge branch 'origin-master' into dev#64573_templates_pour_l_interface_publique_libraire_bootstrap_v55

Conflicts:
	tests/library/Class/WebService/LastfmTest.php
	tests/library/ZendAfi/View/Helper/Abonne/AbonnementTest.php