Fixed so that html is inserted using html() and not text().
Merge branch 'master' into stable