Bring in latest changes from cobbzilla:master