Denis Odintsov Merge branch 'Krypton' of https://github.com/xbmc/xbmc into Krypton