merge from master

have not looked at this but assume we need it, includes 1.7.10 updates