Merge remote-tracking branch 'namecoin-qt/master'
Fixing some merging issues in the last commit.