Merge branch 'master' into convert_fdivs

CREDITS.txt

api/GenApi.py

api/gmsh.py

benchmarks/3d/Cube-01.geo

contrib/WinslowUntangler/winslowUntangler.cpp

contrib/hxt/tetMesh/src/hxt_tetRefine.c

contrib/metis/GKlib/string.c

doc/gmsh.html

doc/texinfo/opt_general.texi

doc/texinfo/opt_geometry.texi

doc/texinfo/opt_mesh.texi

doc/texinfo/plugins.texi

examples/api/torus_bspline.py

src/common/Context.h

src/common/CreateFile.cpp

src/common/DefaultOptions.h

src/common/GmshMessage.cpp

src/common/Options.cpp

src/common/Options.h

src/geo/GModelIO_OCC.cpp