Merge pull request #6617 from dibdot/travelmate-18.06
authorHannu Nyman <hannu.nyman@iki.fi>
Mon, 30 Jul 2018 20:07:09 +0000 (23:07 +0300)
committerGitHub <noreply@github.com>
Mon, 30 Jul 2018 20:07:09 +0000 (23:07 +0300)
travelmate[18.06]: backport release 1.2.1 to 18.06 branch


Trivial merge