small updates related to PLASMA
Merge branch 'pp' of git@github.com:toxa81/sirius into pp
Merge branch 'pp' of git@github.com:toxa81/sirius into pp
Merge branch 'pp' of git@github.com:toxa81/sirius into pp
Merge branch 'pp' of github.com:toxa81/sirius into pp
Merge branch 'pp' of github.com:toxa81/sirius into pp
Merge branch 'pp' of github.com:toxa81/sirius into pp