we should either use master or make a new 1.4.x branch (if it collides with plone5)