Update to 1.6.0 after changes suggested by Ben.

Part of tidying up from the review for TG-559, we need to change the API back to a previous revision.  Makes sense to bump the version number for this.