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