Merge pull request #2049 from DoraXBMC/master