Update Matterhorn to 1.6.0