Fix setup.py
Merge remote-tracking branch 'origin/master' into saily-plone5