Merge pull request #2999 from jefferyto/zope-interface-4.2.0