Finalise 3.6-alpha6
Onward to the future