Switch to lxml for comment stripping.
Merge branch 'master' into circular

* master:
  Switch to lxml for comment stripping.