Merge pull request #3230 from dibdot/travelmate