Building 3.6.0 from now on