resync with telehash:master

resync jer's latest commits