Merge pull request #349 from negativeExponent/unai_plugin_update