Update for panopoly_demo-7.x-1.9