Documentation updates, mostly related to aggregation.
Merge remote-tracking branch 'origin/devel' into devel