Add support for dynamic plugins on Linux
Add support for dynamic plugins on Windows
Merge remote-tracking branch 'upstream/master'