Merge pull request #2009 from dibdot/travelmate