fix imports for plone 4.3 compatibility
Merge remote-tracking branch 'origin/master'
bump version