Editorial changes
Merge branch 'master' into devel

Keeping devel branch up to date with master.