Merge pull request #974 from sipa/walletupgrade