Merge pull request #2967 from dibdot/travelmate