Updating plugins to match master.

I believe this covers everything that isn't currently pending a PR for inclusion from last Friday.