BUG: ampersand escaping
Merge pull request #1267 from g4b0/8309-ampersand-escaping

BUG: ampersand escaping