Fix for OutputInfo -> MethodInfo annotation.
Merge branch 'mpm_plugin_dev' into master.