Merge 1.6.0

Merge the changes from teh 1.6.x branch, up to the v1.6.0 tag, back into the master branch.