Merge remote-tracking branch 'dechamps/staticfix' into 1.1