resync with telehash:master