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