Merge pull request #2805 from dibdot/travelmate