Merge pull request #1817 from dibdot/travelmate