Merge pull request #1777 from dibdot/travelmate