Manually merging current platform master

Fixing JViewHTML test

Fixing broke test