Merge pull request #2499 from dibdot/travelmate