Merge pull request #3610 from dibdot/travelmate