(v1.7) Release commit - see ChangeLog for details.