manual merge, fix minor import issue
manual merge, fix minor import issue

gnu3ra/PyBitmessage,krytarowski/PyBitmessage,Erkan-Yilmaz/PyBitmessage,mailchuck/PyBitmessage,Erkan-Yilmaz/PyBitmessage,torifier/PyBitmessage,Atheros1/PyBitmessage,timothyparez/PyBitmessage,timothyparez/PyBitmessage,hb9kns/PyBitmessage,Atheros1/PyBitmessage,xeddmc/PyBitmessage,debguy0x/PyBitmessage,hb9kns/PyBitmessage,debguy0x/PyBitmessage,krytarowski/PyBitmessage,gnu3ra/PyBitmessage,hb9kns/PyBitmessage,lightrabbit/PyBitmessage,kyucrane/PyBitmessage,xeddmc/PyBitmessage,timothyparez/PyBitmessage,rzr/PyBitmessage,hb9kns/PyBitmessage,mailchuck/PyBitmessage,Atheros1/PyBitmessage,JosephGoulden/PyBitmessageF2F,mailchuck/PyBitmessage,bmng-dev/PyBitmessage,lightrabbit/PyBitmessage,metamarcdw/PyBitmessage-I2P,bmng-dev/PyBitmessage,torifier/PyBitmessage,torifier/PyBitmessage,metamarcdw/PyBitmessage-I2P,bmng-dev/PyBitmessage,debguy0x/PyBitmessage,rzr/PyBitmessage,debguy0x/PyBitmessage,domob1812/PyBitmessage,timothyparez/PyBitmessage,lightrabbit/PyBitmessage,tigerbunny/bitmessage,tigerbunny/bitmessage,lightrabbit/PyBitmessage,Atheros1/PyBitmessage,domob1812/PyBitmessage,domob1812/PyBitmessage,mailchuck/PyBitmessage,JosephGoulden/PyBitmessageF2F,kyucrane/PyBitmessage,torifier/PyBitmessage,tigerbunny/bitmessage