Bring in remaining updates from zinnia 0.14.1.