Auto-Merge pull request #2558 from octo/refactor/plugin_load_file