make our develop match upstream; diffs should be in talkospkg branch