I'm pushing bug 10480, which cleans and makes testable the plugins code.
I encourage all of you that have custom plugins deployed to test them on top of master ASAP. This change is fully backwards-compatible, but if we find issues earlier we can fix them before the release.