Getting ready for 3.6.0