Upgrade undercover to 6.0
Merge pull request #4249 from franklouwers/fix/updateundercover

Upgrade undercover to 6.0