Merge pull request #3234 from dibdot/travelmate