Merge remote-tracking branch 'origin/master' into qt-updates
authorEfraim Flashner <efraim@flashner.co.il>
Sat, 14 Jul 2018 17:55:36 +0000 (20:55 +0300)
committerEfraim Flashner <efraim@flashner.co.il>
Sat, 14 Jul 2018 17:56:03 +0000 (20:56 +0300)

Trivial merge