Update to Matterhorn 1.6-beta3