Merge remote-tracking branch 'sstabellini/for_1.1_rc3' into staging