Merge pull request #407 from annando/removed_lockpath

No match.