More Plasma improvements; Added oomph for Grates.
Merge remote-tracking branch 'origin/master'