NOTICKET: Merging OSM/master to OSM/projects