FROM NOW NO MORE COMMITS HERE

Moved everything to Plone 5 and continue working from there