Merge pull request #2669 from dibdot/travelmate