Style 1.6.x

this picks in a few missing commits to help ensure changes against master aren't subject to painful manual merging later.