3.6 and 3.7 done

Thought I made a commit of 3.6 a few days ago. Woops.