Merge pull request #828 from sipa/fixwalletlock