Merge pull request #1921 from jefferyto/zope-interface