allow failures on Plone 4.3 until new branch mixed
Merge branch 'master' into nitf_galleria