Merge pull request #1234 from stuartpb/patch-2

Explain .lock-wscript and move it