Merge pull request #2007 from dibdot/travelmate