Merge Analyzer Plugins for Master

Review by @retronym. Includes the exact same commits as #2022, plus the merge.