Upstream fork of swig re #120