Upgrade to CM 1.6

@mariansollmann @dlondero