Migration to MATE 1.6 (#2)