Merge remote-tracking branch 'upstream/master'
authorBogdan Vukobratovic <bogdan.vukobratovic@gmail.com>
Tue, 28 May 2019 12:43:27 +0000 (14:43 +0200)
committerBogdan Vukobratovic <bogdan.vukobratovic@gmail.com>
Tue, 28 May 2019 12:43:27 +0000 (14:43 +0200)

Trivial merge