Preparation prior to 1.6.1 release