Updates for swig-3.0.0