changelog
merge lxml-3.2 branch into master