Merge version 1.1.2 of lockrun