merge with OpenELEC