Merge branch 'master' into convert_roundabout_exits