Merge branch 'master' into release
More explicit description of the pretty-printing mode.
Merge branch 'release'