Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption'