Workaround for import problem in Windows.
Merge branch 'release'