Mapgen indev: layers
Merge remote-tracking branch 'upstream/master' into next