Don't log on first pass through lock wait loop
Merge remote-tracking branch 'upstream/master'