Neatening up of code and docs. No functional changes.
Merge remote-tracking branch 'origin/master'