Merge pull request #1791 from dibdot/travelmate