Merge branch 'master' into wip_leon_T7771_html_editor_image_captions
[roojs1] / highlight /
2016-09-09 Alan KnowlesAttribute changed highlight