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