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