Merge branch 'sanity-sleep-fix-master'