3.6/dev intrepid

@justinanderson Is there anything you'd like to merge into 3.6-dev before I go ahead and start on these conflicts?

Also who should I assign this to?