Changing plugin pointer back
Merge pull request #100 from khawkins/master

Changing plugin pointer back
Merge remote-tracking branch 'upstream/master' into unstable_merge
Merging master back to unstable
Merge pull request #101 from khawkins/unstable_merge

Merging master back to unstable