Hotline master

Laurent requested to merge hotline-master into dev#60742_connecteur_sso_moissonnage_la_souris_qui_raconte Jul 11, 2017