Merge topic 'expand-typdefs-stl-args'

822334d5 Fix expansion of stl template args in wrapping

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8371