Merge remote-tracking branch 'upstream/openelec-5.0'