Pin docutils to avoid failing tests on Plone 4.1
Merge remote-tracking branch 'upstream/master'