Merge remote-tracking branch 'upstream/openelec-4.2' into openelec-4.2