Merge branch 'bug_305_add_plugin_where_audiomenu'