[MERGE] Syncing ximatif changes

Those patches dont seem to be needed anymore. Builds fine with upstream version