Merge branch 'master' into CoreCancel

Author: dougzilla32

Sources/MKDirections+Promise.swift

@@ -79,4 +79,4 @@ extension MKDirections {
         return cancellable(calculateETA())
     }
 #endif
-}
+}

Sources/MKMapSnapshotter+Promise.swift

@@ -59,4 +59,4 @@ extension MKMapSnapshotter {
         return cancellable(start())
     }
 #endif
-}
+}