Merged with master from XBMC repository
Merged with master from XBMC repository