1.7.1

this is the pull to bring the various things for version 1.7.1 into master