Updated to Panopoly 1.6