Merge branch 'master' into develop

State.ts

@@ -22,7 +22,7 @@ export class State {
     // The singleton of the global state
     public static state: State;
     
-    public static vNumber = "0.0.8d";
+    public static vNumber = "0.0.8e";
     
     // The user journey states thresholds when a new feature gets unlocked
     public static userJourney = {

assets/themes/cyclestreets/cyclestreets.json

@@ -30,6 +30,7 @@
             "and": [
               "cyclestreet=yes",
               "maxspeed=30",
+              "overtaking:motor_vehicle=no",
               "proposed:cyclestreet="
             ]
           },
@@ -64,7 +65,8 @@
           "if": {
             "and": [
               "cyclestreet=",
-              "proposed:cyclestreet="
+              "proposed:cyclestreet=",
+              "overtaking:motor_vehicle="
             ]
           },
           "then": {