Upgrade to MSC 1.1.1.Final