Let's not autoescape unless we should.
Merges changes.