Merge remote-tracking branch 'upstream/master'
Avoid an unnecessary query if there are no items in the messaging menu
Match Wiki Protocol-spec to program
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master