Merge 'master' into v7.0 for v7.1.0
[osm/RO.git] / deprecated /
2018-08-24 tiernoIntroduce deprecating methods 33/6433/1