Merge branch 'V8_5_asterstudy'

diff --cc CMakeLists.txt
Simple merge

diff --cc doc/salome/gui/SMESH/conf.py.in
index 31257973cad7cac64dd1e6aa8ba01c6a2fb62798,4d56b1b020c027d09a353ae7a6bce039a9acc229..91124d948f8633efc95589a5303f2adbb55dbcd8
--- 1/doc/salome/gui/SMESH/conf.py.in
--- 2/doc/salome/gui/SMESH/conf.py.in
+++ b/doc/salome/gui/SMESH/conf.py.in
@@@ -23,9 -23,13 +23,13 @@@ import sys, o
  
  # Add any Sphinx extension module names here, as strings. They can be extensions
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary',
-                'sphinxcontrib.napoleon'
- ]
 -extensions = ['sphinx.ext.autodoc']
++extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary']
+ try:
+   import sphinxcontrib.napoleon
+   extensions += ['sphinxcontrib.napoleon']
+ except:
+   pass
+ 
  #add pdfbuilder to build a pdf with rst2pdf
  #extensions = ['rst2pdf.pdfbuilder']