manually merging XBMC/Pandora from branch