Switch to 3.6 branch