subs to 1.7/master
merge