push in fixes from 1.6, format repo