et should delete LOCK files before starting
Merge remote-tracking branch 'upstream/master'
Replacing good code by wrong code is never a good idea.