Merge branch 'andrenovax-patch-2'
Merge branch 'master' of https://github.com/42cc/django-bitcoin