Merge pull request #2021 from erwinwinder/master

Fix import