Merge pull request #1685 from dibdot/travelmate