Merge pull request #1573 from thess/squeeze-import