Merge ronis topic

ping @girder/developers @girder/owners I closed the old unmergable topic from roni's remote onto latest master on this topic.