Backport inclusion of compatibility plugin. This has been floating around in dev for a while. Saves having to patch for the compatibility plugin for some functions.