[vlc/f27: 22/22] Merge branch 'master' into f27
commit df97162386c7b3ce8a9856f3069d395ab73549f2
Merge: 6c5a93c 0e7c088
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Aug 31 21:29:30 2018 +0100
Merge branch 'master' into f27
---