Avoid git merge failure with OpenELEC commit 7b1a13f1