Merge pull request #1730 from dibdot/travelmate