Build #923:   Merge branch 'master' into revise-docs on branch revise-docs over 6 years ago