Merge pull request #1 from xbmc/master

FLIX