Merge branch 'master' into v1.1
[osm/UI.git] / manifest / LICENSE