Merge pull request #1648 from dibdot/travelmate