Merge topic 'update-third-party'

ae53a3071b update-third-party: update from upstream

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6571