stash
no auth
Merge branch 'refs/heads/master' into py3

Conflicts:
	trmaid/trmaid.py
stash