Update to SWIG template system