updating lock
Merge branch 'master' into boring-generation