Code

Merge pull request #1875 from rubenk/remove-configfile-h-from-plugins