Merge with travmik's master
Merge branch 'master' into py3

Conflicts:
	ZenTabs.py
	ZenTabsTest.py