Merge pull request #3 from OpenELEC/openelec-4.2

upstream