fixing the plugin repo target branch
Merge pull request #772 from akhileshgupta/master

fixing the plugin repo target branch
Merge remote-tracking branch 'upstream/master' into unstable_merge
Changing plugin back to unstable pointer in unstable
Merge pull request #773 from khawkins/unstable_merge

Merging master to unstable