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