Merge master -> master_vca_intg
[osm/UI.git] / manifest / LICENSE