Work around a SWIG 3.0.2 bug: mis-handling templated constructors
Merge branch 'tickets/DM-768'