Upgrade panopoly magic from 1.6 to 1.7