Fix compatibility with six >= 1.11; Fix import ProtocolTreeNode #2379

noahfx wants to merge 2 commits intotgalal:mastertgalal/yowsup:masterfrom

noahfx:masternoahfx/yowsup:masterCopy head branch name to clipboard