Merge branch 'master' into github-master
Fixed bug when importing a Bitcoin private key manually
Merge branch 'master' into develop