Manually merge 'fix incompatibility with LinguaPlone' pull request