et should delete LOCK files before starting
Merge remote-tracking branch 'upstream/master'