Collection of 1.1.X updates
Extra contributors: Myckel Habets, Jean-Paul Saman
Signed-off-by: Christophe Mutricy <xtophe@chewa.net>