Merge pull request #1564 from dibdot/travelmate-17.01