Merge remote branch 'upstream/openelec-3.0' into openelec-3.0