Get singlenode mapgen

To stay on top of the commits coming from upstream.