Updated third-parties
Merge branch 'master' into mapper