Merge branch 'cve-2016-0718-fix-2-2-1'

Conflicts:
  expat/lib/xmltok.c
tree: f9dbe477dce429eaf3e8f805460106a3dcf99c9c
  1. .gitignore
  2. expat/
  3. htdocs/
  4. testdata/