Fix python setup: Fix issue for users not using python.
Merge pull request #1367 from elmart/python-setup-fix

Fix python setup: Fix issue for users not using python.