Binaries & logos, handle case where it's directly pointing to a plugin folder
Merge remote-tracking branch 'origin/master'