Merge pull request #2402 from dibdot/travelmate