merge with openelec-5.0