fix up build system for swig (d242c30 introduced a subtle error)
Merge branch '1.0.x'