swig is not a runtime depend
Merge branch 'upstream-master'