Openelec 4.2

upstream