Merge "Update plugin revisions" into stable-3.0