Editing documentation.
Merge remote branch 'origin/devel' into devel