Merge remote-tracking branch 'seehuhn/1.1' into 1.1