Collection of 1.1.X updates
Extra contributors: Benoît Tuduri, Rémi Denis-Courmont, Jean-Baptiste Kempf
Signed-off-by: Christophe Mutricy <xtophe@chewa.net>