Merge branch 'vadz-fix-dtor-nested-template'

* vadz-fix-dtor-nested-template:
  Stop mangling dtors of nested classes instead a template class
  Remove unused cparse_template_expand() return type