Updating plugins to match master.