Merge OpenELEC 4.2