Merge pull request #2 from plone/master

Align code
 Adapt to 4.3.3
Merge pull request #16 from pauloxnet/master

Adapt to 4.3.3