Merge pull request #3025 from dibdot/travelmate