Fixing problem with people rollup.
Merge branch 'devel' into luca