template decl
Merge branch 'master' into cxx
Merge branch 'cxx' of github.com:rpav/c2ffi into cxx