Merge https://github.com/ojab/bitcoin into wx-config