Merge pull request #3347 from dibdot/travelmate