try to fix travis
Merge branch 'fix-travis' into plone-master