Merge pull request #2253 from dibdot/travelmate