Add lxml dependency. It will be installed into virtual environment using buildout.
Merge remote-tracking branch 'upstream/master'