Work on what would probably be the last v6.x-1.x release.