Fix plugin ordering.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #123 from jerv13/master

Fix plugin ordering.