Merge branch 'master' into next
Merge topic 'no_track_configured_files'

0264eec cmMakefile: Do not track configured files known to be temporary
Merge topic 'fix-docs-whitespace'

3580b9f Fix some whitespace errors in docs.
Merge branch 'master' into next