Merge pull request #1495 from dibdot/travelmate