Escape html in docs.
Merge branch 'master' of https://github.com/jruby/jruby-parser
Merge remote-tracking branch 'upstream/master'
Missing branch in conditional.

Caused a handful of Rsense's tests to fail.