plugin upgrades 100514
Merge branch 'pluginupgrades100514'