merge upstream/master and resolve conflicts from https://github.com/openstreetmap...