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