Merge pull request #1853 from rubenk/python-plugin-fix-building-on-osx