Attempts to fix issue #230 reported by @foutrelis
changelog
Merge branch 'master' into swig