Merge pull request #2534 from dibdot/travelmate