Merge branch 'master' into wip_leon_T7861_Type_of_news_phase_1
[roojs1] / LICENCE
2015-10-20 Alan KnowlesLICENCE