Merge pull request #1465 from dibdot/travelmate