1.6 release - fixes #3833