Greg-21 and planetmaker Doc: Changed several files to unificate them... (#6964)
...with those from release 1.8 branch.
Latest commit 4ba73da Nov 6, 2018