Merge sophron:master into local openbazaar:master

This branch seem to have been left in the cold for long time, and I can't imagine this merge will go well, testing it out.