Fixes #6511 fixes IE8 html bug in keyword add
Merge branch 'dev' into test