Merge branch 'fix-jquery-newlines'

* fix-jquery-newlines:
  CherryPy: Convert CRLF -> LF newlines
Merge branch 'master' into next