Merge branch 'vdev' into develop
tweval has access to TravelTimes