Merge pull request #1757 from alex/deprecated

Don't trigger any deprecation warnings on import