Update to match plugins/master