Merge remote-tracking branch 'upstream/master'
authorBogdan Vukobratovic <bogdan.vukobratovic@gmail.com>
Thu, 27 Jun 2019 10:11:47 +0000 (12:11 +0200)
committerBogdan Vukobratovic <bogdan.vukobratovic@gmail.com>
Thu, 27 Jun 2019 10:11:47 +0000 (12:11 +0200)

Trivial merge