Merge pull request #3299 from mrunge/master
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 11 Oct 2019 10:32:50 +0000 (12:32 +0200)
committerGitHub <noreply@github.com>
Fri, 11 Oct 2019 10:32:50 +0000 (12:32 +0200)
Merge stable branch back to master


Trivial merge