master
(xbmc/xbmc#12905)

master-last-commmit-before-python3-merge