Fix a bug the buildbot caught
Merge branch 'johanhake/fix-swig-common-include' into next