Collection of 1.1.X updates
Extra contributor: Otto Kekäläinen <otto@sange.fi>
Signed-off-by: Christophe Mutricy <xtophe@chewa.net>