Merge pull request #4291 from dibdot/package-travelmate