beremiz

beremiz/
merged rename_on_location_change branch

2019-04-04, Edouard Tisserant
c08bbfe7bbd4