Collection of 1.1.X update
Extra contributor: Mattias Põldaru <mahfiaz@gmail.com>
Signed-off-by: Christophe Mutricy <xtophe@chewa.net>