Patch in updates to c9ef4700 on 7.x-master.