Merge remote-tracking branch 'xbmc/master'
Fixed auto-scrolling for containers