3.6 dev intrepid merged

@bskinner Here it is. If we start doing work before you merge this, I'm going to branch off of this. No sense in using the current 3.6/dev-intrepid and having to deal with merge issues again, but I also don't want to remake (delete and recreate or force push) a new 3.6/dev-intrepid until this is officially merged.