Merge from OpenBazaar:master