Merge remote-tracking branch 'upstream/master' into anlogic_fixes
authorMiodrag Milanovic <mmicko@gmail.com>
Sun, 18 Aug 2019 09:47:46 +0000 (11:47 +0200)
committerMiodrag Milanovic <mmicko@gmail.com>
Sun, 18 Aug 2019 09:47:46 +0000 (11:47 +0200)

Trivial merge