merge master into v7.0 for v7.1.0
[osm/LCM.git] / LICENSE
2018-05-11 tiernoInitial LCM contribution 30/6130/1