proper identification of 3rd party plugins
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
11.9b.2014
Merge pull request #212 from sbillard/master

11.9b.2014