From 5cbfa289546515953ec10d5cb085ca883a347e28 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 6 Jan 2016 12:59:27 +0000
Subject: [PATCH] update email + web

---
 CMakeLists.txt                                |   2 +-
 CTestConfig.cmake                             |   2 +-
 Common/CMakeLists.txt                         |   2 +-
 Common/Colors.h                               |   2 +-
 Common/CommandLine.cpp                        |   6 +-
 Common/CommandLine.h                          |   2 +-
 Common/Context.cpp                            |   2 +-
 Common/Context.h                              |   2 +-
 Common/CreateFile.cpp                         |   2 +-
 Common/CreateFile.h                           |   2 +-
 Common/DefaultOptions.h                       |   2 +-
 Common/GamePad.cpp                            |   2 +-
 Common/GamePad.h                              |   2 +-
 Common/Gmsh.cpp                               |   2 +-
 Common/Gmsh.h                                 |   2 +-
 Common/GmshConfig.h.in                        |   2 +-
 Common/GmshDefines.h                          |   2 +-
 Common/GmshIO.h                               |   2 +-
 Common/GmshMessage.cpp                        |   2 +-
 Common/GmshMessage.h                          |   2 +-
 Common/GmshRemote.cpp                         |   2 +-
 Common/GmshRemote.h                           |   2 +-
 Common/GmshSocket.h                           |   2 +-
 Common/GmshVersion.h.in                       |   2 +-
 Common/Hash.h                                 |   2 +-
 Common/HashMap.h                              |   2 +-
 Common/ListUtils.cpp                          |   2 +-
 Common/ListUtils.h                            |   2 +-
 Common/Main.cpp                               |   2 +-
 Common/MallocUtils.cpp                        |   2 +-
 Common/MallocUtils.h                          |   2 +-
 Common/OS.cpp                                 |   2 +-
 Common/OS.h                                   |   2 +-
 Common/Octree.cpp                             |   2 +-
 Common/Octree.h                               |   2 +-
 Common/OctreeInternals.cpp                    |   2 +-
 Common/OctreeInternals.h                      |   2 +-
 Common/OpenFile.cpp                           |   2 +-
 Common/OpenFile.h                             |   2 +-
 Common/Options.cpp                            |   2 +-
 Common/Options.h                              |   2 +-
 Common/SmoothData.cpp                         |   2 +-
 Common/SmoothData.h                           |   2 +-
 Common/StringUtils.cpp                        |   2 +-
 Common/StringUtils.h                          |   2 +-
 Common/TreeUtils.cpp                          |   2 +-
 Common/TreeUtils.h                            |   2 +-
 Common/VertexArray.cpp                        |   2 +-
 Common/VertexArray.h                          |   2 +-
 Common/gmshLocalNetworkClient.cpp             |   2 +-
 Common/gmshLocalNetworkClient.h               |   2 +-
 Common/gmshPopplerWrapper.cpp                 |   2 +-
 Common/gmshPopplerWrapper.h                   |   2 +-
 Common/onelab.h                               |   2 +-
 Common/onelabUtils.cpp                        |   2 +-
 Common/onelabUtils.h                          |   2 +-
 Fltk/CMakeLists.txt                           |   2 +-
 Fltk/FlGui.cpp                                |   2 +-
 Fltk/FlGui.h                                  |   2 +-
 Fltk/Main.cpp                                 |   2 +-
 Fltk/Navigator.cpp                            |   2 +-
 Fltk/Navigator.h                              |   2 +-
 Fltk/classificationEditor.cpp                 |   2 +-
 Fltk/classificationEditor.h                   |   2 +-
 Fltk/clippingWindow.cpp                       |   2 +-
 Fltk/clippingWindow.h                         |   2 +-
 Fltk/colorbarWindow.cpp                       |   2 +-
 Fltk/colorbarWindow.h                         |   2 +-
 Fltk/contextWindow.cpp                        |   2 +-
 Fltk/contextWindow.h                          |   2 +-
 Fltk/drawContextFltk.h                        |   2 +-
 Fltk/drawContextFltkCairo.cpp                 |   2 +-
 Fltk/drawContextFltkCairo.h                   |   2 +-
 Fltk/drawContextFltkStringTexture.cpp         |   2 +-
 Fltk/drawContextFltkStringTexture.h           |   2 +-
 Fltk/extraDialogs.cpp                         |   2 +-
 Fltk/extraDialogs.h                           |   2 +-
 Fltk/fieldWindow.cpp                          |   2 +-
 Fltk/fieldWindow.h                            |   2 +-
 Fltk/fileDialogs.cpp                          |   2 +-
 Fltk/fileDialogs.h                            |   2 +-
 Fltk/gamepadWindow.cpp                        |   2 +-
 Fltk/gamepadWindow.h                          |   2 +-
 Fltk/graphicWindow.cpp                        |   8 +-
 Fltk/graphicWindow.h                          |   2 +-
 Fltk/helpWindow.cpp                           |  10 +-
 Fltk/helpWindow.h                             |   2 +-
 Fltk/highOrderToolsWindow.cpp                 |   2 +-
 Fltk/highOrderToolsWindow.h                   |   2 +-
 Fltk/inputRange.h                             |   2 +-
 Fltk/inputRegion.cpp                          |   2 +-
 Fltk/inputRegion.h                            |   2 +-
 Fltk/inputValue.cpp                           |   2 +-
 Fltk/inputValue.h                             |   2 +-
 Fltk/mainWindow.h                             |   2 +-
 Fltk/manipWindow.cpp                          |   2 +-
 Fltk/manipWindow.h                            |   2 +-
 Fltk/onelabGroup.cpp                          |   2 +-
 Fltk/onelabGroup.h                            |   2 +-
 Fltk/openglWindow.cpp                         |   2 +-
 Fltk/openglWindow.h                           |   2 +-
 Fltk/optionWindow.cpp                         |   2 +-
 Fltk/optionWindow.h                           |   2 +-
 Fltk/outputRange.h                            |   2 +-
 Fltk/paletteWindow.h                          |   2 +-
 Fltk/partitionDialog.cpp                      |   2 +-
 Fltk/partitionDialog.h                        |   2 +-
 Fltk/pluginWindow.cpp                         |   2 +-
 Fltk/pluginWindow.h                           |   2 +-
 Fltk/projectionEditor.cpp                     |   2 +-
 Fltk/projectionEditor.h                       |   2 +-
 Fltk/solverButton.cpp                         |   2 +-
 Fltk/solverButton.h                           |   2 +-
 Fltk/spherePositionWidget.h                   |   2 +-
 Fltk/statisticsWindow.cpp                     |   2 +-
 Fltk/statisticsWindow.h                       |   2 +-
 Fltk/treeIcons.h                              |   2 +-
 Fltk/viewButton.cpp                           |   2 +-
 Fltk/viewButton.h                             |   2 +-
 Fltk/visibilityWindow.cpp                     |   2 +-
 Fltk/visibilityWindow.h                       |   2 +-
 FunctionSpace/CMakeLists.txt                  |   2 +-
 Geo/ACISEdge.cpp                              |   2 +-
 Geo/ACISEdge.h                                |   2 +-
 Geo/ACISFace.cpp                              |   2 +-
 Geo/ACISFace.h                                |   2 +-
 Geo/ACISVertex.cpp                            |   2 +-
 Geo/ACISVertex.h                              |   2 +-
 Geo/CGNSOptions.h                             |   2 +-
 Geo/CMakeLists.txt                            |   2 +-
 Geo/Cell.cpp                                  |   2 +-
 Geo/Cell.h                                    |   2 +-
 Geo/CellComplex.cpp                           |   2 +-
 Geo/CellComplex.h                             |   2 +-
 Geo/Chain.cpp                                 |   2 +-
 Geo/Chain.h                                   |   2 +-
 Geo/ChainComplex.cpp                          |   2 +-
 Geo/ChainComplex.h                            |   2 +-
 Geo/Curvature.cpp                             |   2 +-
 Geo/Curvature.h                               |   2 +-
 Geo/CustomContainer.h                         |   2 +-
 Geo/ExtrudeParams.cpp                         |   2 +-
 Geo/ExtrudeParams.h                           |   2 +-
 Geo/GEdge.cpp                                 |   2 +-
 Geo/GEdge.h                                   |   2 +-
 Geo/GEdgeCompound.cpp                         |   2 +-
 Geo/GEdgeCompound.h                           |   2 +-
 Geo/GEdgeLoop.cpp                             |   2 +-
 Geo/GEdgeLoop.h                               |   2 +-
 Geo/GEntity.cpp                               |   2 +-
 Geo/GEntity.h                                 |   2 +-
 Geo/GFace.cpp                                 |   2 +-
 Geo/GFace.h                                   |   2 +-
 Geo/GFaceCompound.cpp                         |   2 +-
 Geo/GFaceCompound.h                           |   2 +-
 Geo/GModel.cpp                                |   2 +-
 Geo/GModel.h                                  |   2 +-
 Geo/GModelFactory.cpp                         |   2 +-
 Geo/GModelFactory.h                           |   2 +-
 Geo/GModelIO_ACIS.cpp                         |   2 +-
 Geo/GModelIO_ACTRAN.cpp                       |   2 +-
 Geo/GModelIO_BDF.cpp                          |   2 +-
 Geo/GModelIO_CELUM.cpp                        |   2 +-
 Geo/GModelIO_CGNS.cpp                         |   2 +-
 Geo/GModelIO_DIFF.cpp                         |   2 +-
 Geo/GModelIO_Fourier.cpp                      |   2 +-
 Geo/GModelIO_Fourier.h                        |   2 +-
 Geo/GModelIO_GEO.cpp                          |   2 +-
 Geo/GModelIO_GEOM.cpp                         |   2 +-
 Geo/GModelIO_INP.cpp                          |   2 +-
 Geo/GModelIO_IR3.cpp                          |   2 +-
 Geo/GModelIO_MAIL.cpp                         |   2 +-
 Geo/GModelIO_MED.cpp                          |   2 +-
 Geo/GModelIO_MESH.cpp                         |   2 +-
 Geo/GModelIO_MSH.cpp                          |   2 +-
 Geo/GModelIO_MSH2.cpp                         |   2 +-
 Geo/GModelIO_OCC.cpp                          |   2 +-
 Geo/GModelIO_OCC.h                            |   2 +-
 Geo/GModelIO_P3D.cpp                          |   2 +-
 Geo/GModelIO_PLY.cpp                          |   2 +-
 Geo/GModelIO_POS.cpp                          |   2 +-
 Geo/GModelIO_SGEOM.cpp                        |   2 +-
 Geo/GModelIO_SGEOM.h                          |   2 +-
 Geo/GModelIO_STL.cpp                          |   2 +-
 Geo/GModelIO_SU2.cpp                          |   2 +-
 Geo/GModelIO_UNV.cpp                          |   2 +-
 Geo/GModelIO_VRML.cpp                         |   2 +-
 Geo/GModelIO_VTK.cpp                          |   2 +-
 Geo/GModelVertexArrays.cpp                    |   2 +-
 Geo/GPoint.h                                  |   2 +-
 Geo/GRbf.cpp                                  |   2 +-
 Geo/GRbf.h                                    |   2 +-
 Geo/GRegion.cpp                               |   2 +-
 Geo/GRegion.h                                 |   2 +-
 Geo/GRegionCompound.cpp                       |   2 +-
 Geo/GRegionCompound.h                         |   2 +-
 Geo/GVertex.cpp                               |   2 +-
 Geo/GVertex.h                                 |   2 +-
 Geo/GenericEdge.cpp                           |   2 +-
 Geo/GenericEdge.h                             |   2 +-
 Geo/GenericFace.cpp                           |   2 +-
 Geo/GenericFace.h                             |   2 +-
 Geo/GenericRegion.cpp                         |   2 +-
 Geo/GenericRegion.h                           |   2 +-
 Geo/GenericVertex.cpp                         |   2 +-
 Geo/GenericVertex.h                           |   2 +-
 Geo/Geo.cpp                                   |   2 +-
 Geo/Geo.h                                     |   2 +-
 Geo/GeoInterpolation.cpp                      |   2 +-
 Geo/GeoInterpolation.h                        |   2 +-
 Geo/GeoStringInterface.cpp                    |   2 +-
 Geo/GeoStringInterface.h                      |   2 +-
 Geo/GeomMeshMatcher.cpp                       |   2 +-
 Geo/GeomMeshMatcher.h                         |   2 +-
 Geo/Homology.cpp                              |   2 +-
 Geo/Homology.h                                |   2 +-
 Geo/MEdge.cpp                                 |   2 +-
 Geo/MEdge.h                                   |   2 +-
 Geo/MEdgeHash.h                               |   2 +-
 Geo/MElement.cpp                              |   2 +-
 Geo/MElement.h                                |   2 +-
 Geo/MElementCut.cpp                           |   2 +-
 Geo/MElementCut.h                             |   2 +-
 Geo/MElementOctree.cpp                        |   2 +-
 Geo/MElementOctree.h                          |   2 +-
 Geo/MFace.cpp                                 |   2 +-
 Geo/MFace.h                                   |   2 +-
 Geo/MFaceHash.h                               |   2 +-
 Geo/MHexahedron.cpp                           |   2 +-
 Geo/MHexahedron.h                             |   2 +-
 Geo/MLine.cpp                                 |   2 +-
 Geo/MLine.h                                   |   2 +-
 Geo/MPoint.h                                  |   2 +-
 Geo/MPrism.cpp                                |   2 +-
 Geo/MPrism.h                                  |   2 +-
 Geo/MPyramid.cpp                              |   2 +-
 Geo/MPyramid.h                                |   2 +-
 Geo/MQuadrangle.cpp                           |   2 +-
 Geo/MQuadrangle.h                             |   2 +-
 Geo/MSubElement.cpp                           |   2 +-
 Geo/MSubElement.h                             |   2 +-
 Geo/MTetrahedron.cpp                          |   2 +-
 Geo/MTetrahedron.h                            |   2 +-
 Geo/MTriangle.cpp                             |   2 +-
 Geo/MTriangle.h                               |   2 +-
 Geo/MVertex.cpp                               |   2 +-
 Geo/MVertex.h                                 |   2 +-
 Geo/MVertexBoundaryLayerData.cpp              |   2 +-
 Geo/MVertexBoundaryLayerData.h                |   2 +-
 Geo/MVertexRTree.h                            |   2 +-
 Geo/MZone.cpp                                 |   2 +-
 Geo/MZone.h                                   |   2 +-
 Geo/MZoneBoundary.cpp                         |   2 +-
 Geo/MZoneBoundary.h                           |   2 +-
 Geo/OCCEdge.cpp                               |   2 +-
 Geo/OCCEdge.h                                 |   2 +-
 Geo/OCCFace.cpp                               |   2 +-
 Geo/OCCFace.h                                 |   2 +-
 Geo/OCCIncludes.h                             |   2 +-
 Geo/OCCRegion.cpp                             |   2 +-
 Geo/OCCRegion.h                               |   2 +-
 Geo/OCCVertex.cpp                             |   2 +-
 Geo/OCCVertex.h                               |   2 +-
 Geo/OCC_Connect.cpp                           |   2 +-
 Geo/OCC_Connect.h                             |   2 +-
 Geo/Pair.h                                    |   2 +-
 Geo/Range.h                                   |   2 +-
 Geo/SBoundingBox3d.h                          |   2 +-
 Geo/SGEOMIncludes.h                           |   2 +-
 Geo/SOrientedBoundingBox.cpp                  |   2 +-
 Geo/SOrientedBoundingBox.h                    |   2 +-
 Geo/SPoint2.h                                 |   2 +-
 Geo/SPoint3.h                                 |   2 +-
 Geo/STensor3.cpp                              |   2 +-
 Geo/STensor3.h                                |   2 +-
 Geo/SVector3.h                                |   2 +-
 Geo/boundaryLayersData.cpp                    |   2 +-
 Geo/boundaryLayersData.h                      |   2 +-
 Geo/closestPoint.cpp                          |   2 +-
 Geo/closestPoint.h                            |   2 +-
 Geo/discreteEdge.cpp                          |   2 +-
 Geo/discreteEdge.h                            |   2 +-
 Geo/discreteFace.cpp                          |   2 +-
 Geo/discreteFace.h                            |   2 +-
 Geo/discreteRegion.cpp                        |   2 +-
 Geo/discreteRegion.h                          |   2 +-
 Geo/discreteVertex.h                          |   2 +-
 Geo/findLinks.cpp                             |   2 +-
 Geo/findLinks.h                               |   2 +-
 Geo/fourierEdge.cpp                           |   2 +-
 Geo/fourierEdge.h                             |   2 +-
 Geo/fourierFace.cpp                           |   2 +-
 Geo/fourierFace.h                             |   2 +-
 Geo/fourierProjectionFace.cpp                 |   2 +-
 Geo/fourierProjectionFace.h                   |   2 +-
 Geo/fourierVertex.h                           |   2 +-
 Geo/gmshEdge.cpp                              |   2 +-
 Geo/gmshEdge.h                                |   2 +-
 Geo/gmshEdgeDiscretize.cpp                    |   2 +-
 Geo/gmshFace.cpp                              |   2 +-
 Geo/gmshFace.h                                |   2 +-
 Geo/gmshLevelset.cpp                          |   2 +-
 Geo/gmshLevelset.h                            |   2 +-
 Geo/gmshRegion.cpp                            |   2 +-
 Geo/gmshRegion.h                              |   2 +-
 Geo/gmshSurface.cpp                           |   2 +-
 Geo/gmshSurface.h                             |   2 +-
 Geo/gmshVertex.cpp                            |   2 +-
 Geo/gmshVertex.h                              |   2 +-
 Geo/intersectCurveSurface.cpp                 |   2 +-
 Geo/intersectCurveSurface.h                   |   2 +-
 Geo/partitionEdge.h                           |   2 +-
 Geo/partitionFace.h                           |   2 +-
 Geo/partitionVertex.h                         |   2 +-
 Graphics/CMakeLists.txt                       |   2 +-
 Graphics/Camera.cpp                           |   2 +-
 Graphics/Camera.h                             |   2 +-
 Graphics/PixelBuffer.h                        |   2 +-
 Graphics/ReadImg.cpp                          |   2 +-
 Graphics/ReadImg.h                            |   2 +-
 Graphics/drawAxes.cpp                         |   2 +-
 Graphics/drawContext.cpp                      |   2 +-
 Graphics/drawContext.h                        |   2 +-
 Graphics/drawGeom.cpp                         |   2 +-
 Graphics/drawGlyph.cpp                        |   2 +-
 Graphics/drawGraph2d.cpp                      |   2 +-
 Graphics/drawMesh.cpp                         |   2 +-
 Graphics/drawPost.cpp                         |   2 +-
 Graphics/drawScales.cpp                       |   2 +-
 Graphics/gl2gif.cpp                           |   2 +-
 Graphics/gl2gif.h                             |   2 +-
 Graphics/gl2jpeg.cpp                          |   2 +-
 Graphics/gl2jpeg.h                            |   2 +-
 Graphics/gl2pgf.cpp                           |   2 +-
 Graphics/gl2pgf.h                             |   2 +-
 Graphics/gl2png.cpp                           |   2 +-
 Graphics/gl2png.h                             |   2 +-
 Graphics/gl2ppm.cpp                           |   2 +-
 Graphics/gl2ppm.h                             |   2 +-
 Graphics/gl2yuv.cpp                           |   2 +-
 Graphics/gl2yuv.h                             |   2 +-
 Mesh/BDS.cpp                                  |   2 +-
 Mesh/BDS.h                                    |   2 +-
 Mesh/BGMBase.cpp                              |   2 +-
 Mesh/BGMBase.h                                |   2 +-
 Mesh/BackgroundMesh.cpp                       |   2 +-
 Mesh/BackgroundMesh.h                         |   2 +-
 Mesh/BackgroundMesh2D.cpp                     |   2 +-
 Mesh/BackgroundMesh2D.h                       |   2 +-
 Mesh/BackgroundMesh3D.cpp                     |   2 +-
 Mesh/BackgroundMesh3D.h                       |   2 +-
 Mesh/BackgroundMeshManager.cpp                |   2 +-
 Mesh/BackgroundMeshManager.h                  |   2 +-
 Mesh/BackgroundMeshTools.cpp                  |   2 +-
 Mesh/BackgroundMeshTools.h                    |   2 +-
 Mesh/BoundaryLayers.cpp                       |   2 +-
 Mesh/BoundaryLayers.h                         |   2 +-
 Mesh/CMakeLists.txt                           |   2 +-
 Mesh/CenterlineField.cpp                      |   2 +-
 Mesh/CenterlineField.h                        |   2 +-
 Mesh/DivideAndConquer.cpp                     |   2 +-
 Mesh/DivideAndConquer.h                       |   2 +-
 Mesh/Field.cpp                                |   2 +-
 Mesh/Field.h                                  |   2 +-
 Mesh/FieldPython.h                            |   2 +-
 Mesh/Generator.cpp                            |   2 +-
 Mesh/Generator.h                              |   2 +-
 Mesh/HighOrder.cpp                            |   2 +-
 Mesh/HighOrder.h                              |   2 +-
 Mesh/Levy3D.cpp                               |   2 +-
 Mesh/Levy3D.h                                 |   2 +-
 Mesh/QuadTriExtruded2D.cpp                    |   4 +-
 Mesh/QuadTriExtruded2D.h                      |   2 +-
 Mesh/QuadTriExtruded3D.cpp                    |   4 +-
 Mesh/QuadTriExtruded3D.h                      |   2 +-
 Mesh/QuadTriTransfinite3D.cpp                 |   4 +-
 Mesh/QuadTriTransfinite3D.h                   |   2 +-
 Mesh/QuadTriUtils.cpp                         |   5 +-
 Mesh/QuadTriUtils.h                           |   2 +-
 Mesh/ThinLayer.cpp                            |   2 +-
 Mesh/ThinLayer.h                              |   2 +-
 Mesh/Voronoi3D.cpp                            |   2 +-
 Mesh/Voronoi3D.h                              |   2 +-
 Mesh/cross3D.h                                |   2 +-
 Mesh/delaunay3d.cpp                           |   2 +-
 Mesh/delaunay3d.h                             |   2 +-
 Mesh/delaunay3d_private.h                     |   2 +-
 Mesh/directions3D.cpp                         |   2 +-
 Mesh/directions3D.h                           |   2 +-
 Mesh/filterElements.cpp                       |   2 +-
 Mesh/filterElements.h                         |   2 +-
 Mesh/meshGEdge.cpp                            |   2 +-
 Mesh/meshGEdge.h                              |   2 +-
 Mesh/meshGEdgeExtruded.cpp                    |   2 +-
 Mesh/meshGFace.cpp                            |   2 +-
 Mesh/meshGFace.h                              |   2 +-
 Mesh/meshGFaceBDS.cpp                         |   2 +-
 Mesh/meshGFaceBDS.h                           |   2 +-
 Mesh/meshGFaceBamg.cpp                        |   2 +-
 Mesh/meshGFaceBamg.h                          |   2 +-
 Mesh/meshGFaceDelaunayInsertion.cpp           |   2 +-
 Mesh/meshGFaceDelaunayInsertion.h             |   2 +-
 Mesh/meshGFaceElliptic.cpp                    |   2 +-
 Mesh/meshGFaceElliptic.h                      |   2 +-
 Mesh/meshGFaceExtruded.cpp                    |   2 +-
 Mesh/meshGFaceLloyd.cpp                       |   2 +-
 Mesh/meshGFaceLloyd.h                         |   2 +-
 Mesh/meshGFaceOptimize.cpp                    |   2 +-
 Mesh/meshGFaceOptimize.h                      |   2 +-
 Mesh/meshGFaceQuadrilateralize.cpp            |   2 +-
 Mesh/meshGFaceQuadrilateralize.h              |   2 +-
 Mesh/meshGFaceRecombine.cpp                   | 542 +++++++++---------
 Mesh/meshGFaceRecombine.h                     | 354 +++++-------
 Mesh/meshGFaceTransfinite.cpp                 |   2 +-
 Mesh/meshGRegion.cpp                          |   2 +-
 Mesh/meshGRegion.h                            |   2 +-
 Mesh/meshGRegion19036.cpp                     |   2 +-
 Mesh/meshGRegionBoundaryRecovery.cpp          |   2 +-
 Mesh/meshGRegionBoundaryRecovery.h            |   2 +-
 Mesh/meshGRegionCarveHole.cpp                 |   2 +-
 Mesh/meshGRegionDelaunayInsertion.cpp         |   2 +-
 Mesh/meshGRegionDelaunayInsertion.h           |   2 +-
 Mesh/meshGRegionExtruded.cpp                  |   2 +-
 Mesh/meshGRegionLocalMeshMod.cpp              |   2 +-
 Mesh/meshGRegionLocalMeshMod.h                |   2 +-
 Mesh/meshGRegionMMG3D.cpp                     |   2 +-
 Mesh/meshGRegionMMG3D.h                       |   2 +-
 Mesh/meshGRegionTransfinite.cpp               |   2 +-
 Mesh/meshMetric.cpp                           |   2 +-
 Mesh/meshMetric.h                             |   2 +-
 Mesh/meshPartition.cpp                        |   2 +-
 Mesh/meshPartition.h                          |   2 +-
 Mesh/meshPartitionObjects.h                   |   2 +-
 Mesh/meshPartitionOptions.h                   |   2 +-
 Mesh/meshRecombine2D.cpp                      |   4 +-
 Mesh/meshRecombine2D_2.cpp                    |   4 +-
 Mesh/meshRefine.cpp                           |   2 +-
 Mesh/multiscalePartition.cpp                  |   2 +-
 Mesh/multiscalePartition.h                    |   2 +-
 Mesh/periodical.cpp                           |   2 +-
 Mesh/periodical.h                             |   2 +-
 Mesh/pointInsertion.cpp                       |   2 +-
 Mesh/pointInsertion.h                         |   2 +-
 Mesh/pointInsertionRTreeTools.cpp             |   2 +-
 Mesh/pointInsertionRTreeTools.h               |   2 +-
 Mesh/qualityMeasures.cpp                      |   2 +-
 Mesh/qualityMeasures.h                        |   2 +-
 Mesh/simple3D.cpp                             |   2 +-
 Mesh/simple3D.h                               |   2 +-
 Mesh/surfaceFiller.cpp                        |   2 +-
 Mesh/surfaceFiller.h                          |   2 +-
 Mesh/yamakawa.cpp                             |   2 +-
 Mesh/yamakawa.h                               |   2 +-
 Numeric/BasisFactory.cpp                      |   2 +-
 Numeric/BasisFactory.h                        |   2 +-
 Numeric/BergotBasis.cpp                       |   2 +-
 Numeric/BergotBasis.h                         |   2 +-
 Numeric/CMakeLists.txt                        |   2 +-
 Numeric/CondNumBasis.cpp                      |   2 +-
 Numeric/CondNumBasis.h                        |   2 +-
 Numeric/ConjugateGradients.cpp                |   2 +-
 Numeric/ConjugateGradients.h                  |   2 +-
 Numeric/ElementType.cpp                       |   2 +-
 Numeric/ElementType.h                         |   2 +-
 Numeric/FuncSpaceData.cpp                     |   2 +-
 Numeric/FuncSpaceData.h                       |   2 +-
 Numeric/GaussIntegration.cpp                  |   2 +-
 Numeric/GaussIntegration.h                    |   2 +-
 Numeric/GaussJacobi1D.cpp                     |   2 +-
 Numeric/GaussJacobi1D.h                       |   2 +-
 Numeric/GaussLegendre1D.h                     |   2 +-
 Numeric/GaussLegendreSimplex.cpp              |   2 +-
 Numeric/GaussQuadratureHex.cpp                |   2 +-
 Numeric/GaussQuadratureLin.cpp                |   2 +-
 Numeric/GaussQuadraturePri.cpp                |   2 +-
 Numeric/GaussQuadraturePyr.cpp                |   2 +-
 Numeric/GaussQuadratureQuad.cpp               |   2 +-
 Numeric/GaussQuadratureTet.cpp                |   2 +-
 Numeric/GaussQuadratureTri.cpp                |   2 +-
 Numeric/HilbertCurve.cpp                      |   2 +-
 Numeric/HilbertCurve.h                        |   2 +-
 Numeric/Iso.cpp                               |   2 +-
 Numeric/Iso.h                                 |   2 +-
 Numeric/JacobianBasis.cpp                     |   2 +-
 Numeric/JacobianBasis.h                       |   2 +-
 Numeric/MetricBasis.cpp                       |   2 +-
 Numeric/MetricBasis.h                         |   2 +-
 Numeric/Numeric.cpp                           |   2 +-
 Numeric/Numeric.h                             |   2 +-
 Numeric/approximationError.cpp                |   2 +-
 Numeric/approximationError.h                  |   2 +-
 Numeric/bezierBasis.cpp                       |   2 +-
 Numeric/bezierBasis.h                         |   2 +-
 Numeric/cartesian.h                           |   2 +-
 Numeric/decasteljau.cpp                       |   2 +-
 Numeric/decasteljau.h                         |   2 +-
 Numeric/discreteFrechetDistance.cpp           |   2 +-
 Numeric/discreteFrechetDistance.h             |   2 +-
 Numeric/fullMatrix.cpp                        |   2 +-
 Numeric/fullMatrix.h                          |   2 +-
 Numeric/hausdorffDistance.cpp                 |   2 +-
 Numeric/jacobiPolynomials.cpp                 |   2 +-
 Numeric/jacobiPolynomials.h                   |   2 +-
 Numeric/legendrePolynomials.cpp               |   2 +-
 Numeric/legendrePolynomials.h                 |   2 +-
 Numeric/mathEvaluator.cpp                     |   2 +-
 Numeric/mathEvaluator.h                       |   2 +-
 Numeric/miniBasis.cpp                         |   2 +-
 Numeric/miniBasis.h                           |   2 +-
 Numeric/nodalBasis.cpp                        |   2 +-
 Numeric/nodalBasis.h                          |   2 +-
 Numeric/pointsGenerators.cpp                  |   2 +-
 Numeric/pointsGenerators.h                    |   2 +-
 Numeric/polynomialBasis.cpp                   |   2 +-
 Numeric/polynomialBasis.h                     |   2 +-
 Numeric/pyramidalBasis.cpp                    |   2 +-
 Numeric/pyramidalBasis.h                      |   2 +-
 Numeric/robustPredicates.h                    |   2 +-
 Numeric/simpleFunction.h                      |   2 +-
 Numeric/simpleFunctionPython.h                |   2 +-
 Parser/CMakeLists.txt                         |   2 +-
 Parser/FunctionManager.cpp                    |   2 +-
 Parser/FunctionManager.h                      |   2 +-
 Parser/Gmsh.l                                 |   2 +-
 Parser/Gmsh.tab.cpp                           |   2 +-
 Parser/Gmsh.y                                 |   2 +-
 Parser/Gmsh.yy.cpp                            |   2 +-
 Parser/Parser.h                               |   2 +-
 Plugin/AnalyseCurvedMesh.cpp                  |   2 +-
 Plugin/AnalyseCurvedMesh.h                    |   2 +-
 Plugin/Annotate.cpp                           |   2 +-
 Plugin/Annotate.h                             |   2 +-
 Plugin/Bubbles.cpp                            |   2 +-
 Plugin/Bubbles.h                              |   2 +-
 Plugin/CMakeLists.txt                         |   2 +-
 Plugin/CVTRemesh.cpp                          |   2 +-
 Plugin/CVTRemesh.h                            |   2 +-
 Plugin/Crack.cpp                              |   2 +-
 Plugin/Crack.h                                |   2 +-
 Plugin/Curl.cpp                               |   2 +-
 Plugin/Curl.h                                 |   2 +-
 Plugin/CurvedBndDist.cpp                      |   2 +-
 Plugin/CurvedBndDist.h                        |   2 +-
 Plugin/CutBox.cpp                             |   2 +-
 Plugin/CutBox.h                               |   2 +-
 Plugin/CutGrid.cpp                            |   2 +-
 Plugin/CutGrid.h                              |   2 +-
 Plugin/CutMesh.cpp                            |   2 +-
 Plugin/CutMesh.h                              |   2 +-
 Plugin/CutParametric.cpp                      |   2 +-
 Plugin/CutParametric.h                        |   2 +-
 Plugin/CutPlane.cpp                           |   2 +-
 Plugin/CutPlane.h                             |   2 +-
 Plugin/CutSphere.cpp                          |   2 +-
 Plugin/CutSphere.h                            |   2 +-
 Plugin/DiscretizationError.cpp                |   2 +-
 Plugin/DiscretizationError.h                  |   2 +-
 Plugin/Distance.cpp                           |   2 +-
 Plugin/Distance.h                             |   2 +-
 Plugin/Divergence.cpp                         |   2 +-
 Plugin/Divergence.h                           |   2 +-
 Plugin/DuplicateBoundaries.cpp                |   2 +-
 Plugin/DuplicateBoundaries.h                  |   2 +-
 Plugin/Eigenvalues.cpp                        |   2 +-
 Plugin/Eigenvalues.h                          |   2 +-
 Plugin/Eigenvectors.cpp                       |   2 +-
 Plugin/Eigenvectors.h                         |   2 +-
 Plugin/ExtractEdges.cpp                       |   2 +-
 Plugin/ExtractEdges.h                         |   2 +-
 Plugin/ExtractElements.cpp                    |   2 +-
 Plugin/ExtractElements.h                      |   2 +-
 Plugin/FaultZone.cpp                          |   2 +-
 Plugin/FaultZone.h                            |   2 +-
 Plugin/FieldFromAmplitudePhase.cpp            |   2 +-
 Plugin/FieldFromAmplitudePhase.h              |   2 +-
 Plugin/Gradient.cpp                           |   2 +-
 Plugin/Gradient.h                             |   2 +-
 Plugin/HarmonicToTime.cpp                     |   2 +-
 Plugin/HarmonicToTime.h                       |   2 +-
 Plugin/HomologyComputation.cpp                |   2 +-
 Plugin/HomologyComputation.h                  |   2 +-
 Plugin/HomologyPostProcessing.cpp             |   2 +-
 Plugin/HomologyPostProcessing.h               |   2 +-
 Plugin/Integrate.cpp                          |   2 +-
 Plugin/Integrate.h                            |   2 +-
 Plugin/Isosurface.cpp                         |   2 +-
 Plugin/Isosurface.h                           |   2 +-
 Plugin/Lambda2.cpp                            |   2 +-
 Plugin/Lambda2.h                              |   2 +-
 Plugin/Levelset.cpp                           |   2 +-
 Plugin/Levelset.h                             |   2 +-
 Plugin/LongitudeLatitude.cpp                  |   2 +-
 Plugin/LongitudeLatitude.h                    |   2 +-
 Plugin/MakeSimplex.cpp                        |   2 +-
 Plugin/MakeSimplex.h                          |   2 +-
 Plugin/MathEval.cpp                           |   2 +-
 Plugin/MathEval.h                             |   2 +-
 Plugin/MeshSubEntities.cpp                    |   2 +-
 Plugin/MeshSubEntities.h                      |   2 +-
 Plugin/MinMax.cpp                             |   2 +-
 Plugin/MinMax.h                               |   2 +-
 Plugin/ModifyComponents.cpp                   |   2 +-
 Plugin/ModifyComponents.h                     |   2 +-
 Plugin/ModulusPhase.cpp                       |   2 +-
 Plugin/ModulusPhase.h                         |   2 +-
 Plugin/NearToFarField.cpp                     |   2 +-
 Plugin/NearToFarField.h                       |   2 +-
 Plugin/NearestNeighbor.cpp                    |   2 +-
 Plugin/NearestNeighbor.h                      |   2 +-
 Plugin/NewView.cpp                            |   2 +-
 Plugin/NewView.h                              |   2 +-
 Plugin/Particles.cpp                          |   2 +-
 Plugin/Particles.h                            |   2 +-
 Plugin/Plugin.cpp                             |   2 +-
 Plugin/Plugin.h                               |   2 +-
 Plugin/PluginManager.cpp                      |   2 +-
 Plugin/PluginManager.h                        |   2 +-
 Plugin/Probe.cpp                              |   2 +-
 Plugin/Probe.h                                |   2 +-
 Plugin/Remove.cpp                             |   2 +-
 Plugin/Remove.h                               |   2 +-
 Plugin/Scal2Tens.cpp                          |   2 +-
 Plugin/Scal2Tens.h                            |   2 +-
 Plugin/Scal2Vec.cpp                           |   2 +-
 Plugin/Scal2Vec.h                             |   2 +-
 Plugin/SimplePartition.cpp                    |   2 +-
 Plugin/SimplePartition.h                      |   2 +-
 Plugin/Skin.cpp                               |   2 +-
 Plugin/Skin.h                                 |   2 +-
 Plugin/Smooth.cpp                             |   2 +-
 Plugin/Smooth.h                               |   2 +-
 Plugin/SphericalRaise.cpp                     |   2 +-
 Plugin/SphericalRaise.h                       |   2 +-
 Plugin/StreamLines.cpp                        |   2 +-
 Plugin/StreamLines.h                          |   2 +-
 Plugin/Tetrahedralize.cpp                     |   2 +-
 Plugin/Tetrahedralize.h                       |   2 +-
 Plugin/ThinLayerFixMesh.cpp                   |   2 +-
 Plugin/ThinLayerFixMesh.h                     |   2 +-
 Plugin/Transform.cpp                          |   2 +-
 Plugin/Transform.h                            |   2 +-
 Plugin/Triangulate.cpp                        |   2 +-
 Plugin/Triangulate.h                          |   2 +-
 Plugin/Warp.cpp                               |   2 +-
 Plugin/Warp.h                                 |   2 +-
 Post/CMakeLists.txt                           |   2 +-
 Post/ColorTable.cpp                           |   2 +-
 Post/ColorTable.h                             |   2 +-
 Post/OctreePost.cpp                           |   2 +-
 Post/OctreePost.h                             |   2 +-
 Post/PView.cpp                                |   2 +-
 Post/PView.h                                  |   2 +-
 Post/PViewAsSimpleFunction.cpp                |   2 +-
 Post/PViewAsSimpleFunction.h                  |   2 +-
 Post/PViewData.cpp                            |   2 +-
 Post/PViewData.h                              |   2 +-
 Post/PViewDataGModel.cpp                      |   2 +-
 Post/PViewDataGModel.h                        |   2 +-
 Post/PViewDataGModelIO.cpp                    |   2 +-
 Post/PViewDataIO.cpp                          |   2 +-
 Post/PViewDataList.cpp                        |   2 +-
 Post/PViewDataList.h                          |   2 +-
 Post/PViewDataListIO.cpp                      |   2 +-
 Post/PViewDataRemote.h                        |   2 +-
 Post/PViewFactory.cpp                         |   2 +-
 Post/PViewFactory.h                           |   2 +-
 Post/PViewIO.cpp                              |   2 +-
 Post/PViewOptions.cpp                         |   2 +-
 Post/PViewOptions.h                           |   2 +-
 Post/PViewVertexArrays.cpp                    |   2 +-
 Post/PViewX3D.cpp                             |   2 +-
 Post/PViewX3D.h                               |   2 +-
 Post/adaptiveData.cpp                         |   2 +-
 Post/adaptiveData.h                           |   2 +-
 Post/shapeFunctions.cpp                       |   2 +-
 Post/shapeFunctions.h                         |   2 +-
 Qt/CMakeLists.txt                             |   2 +-
 Qt/GLWidget.cpp                               |   2 +-
 Qt/GLWidget.h                                 |   2 +-
 Qt/Main.cpp                                   |   2 +-
 Qt/QGui.cpp                                   |   2 +-
 Qt/QGui.h                                     |   2 +-
 Qt/graphicWindow.cpp                          |   2 +-
 Qt/graphicWindow.h                            |   2 +-
 Solver/CMakeLists.txt                         |   2 +-
 Solver/FuncGradDisc.h                         |   2 +-
 Solver/FuncHeaviside.h                        |   2 +-
 Solver/SElement.cpp                           |   2 +-
 Solver/SElement.h                             |   2 +-
 Solver/STensor33.cpp                          |   2 +-
 Solver/STensor33.h                            |   2 +-
 Solver/STensor43.cpp                          |   2 +-
 Solver/STensor43.h                            |   2 +-
 Solver/STensor53.cpp                          |   2 +-
 Solver/STensor53.h                            |   2 +-
 Solver/STensor63.cpp                          |   2 +-
 Solver/STensor63.h                            |   2 +-
 Solver/convexCombinationTerm.h                |  11 +-
 Solver/crossConfTerm.h                        |   2 +-
 Solver/diagBCTerm.h                           |   2 +-
 Solver/distanceTerm.h                         |   2 +-
 Solver/dofManager.cpp                         |   2 +-
 Solver/dofManager.h                           |   2 +-
 Solver/eigenSolver.cpp                        |   2 +-
 Solver/eigenSolver.h                          |   2 +-
 Solver/elasticitySolver.cpp                   |   2 +-
 Solver/elasticitySolver.h                     |   2 +-
 Solver/elasticityTerm.cpp                     |   2 +-
 Solver/elasticityTerm.h                       |   2 +-
 Solver/femTerm.h                              |   2 +-
 Solver/filters.cpp                            |   2 +-
 Solver/filters.h                              |   2 +-
 Solver/frameSolver.h                          |   2 +-
 Solver/functionSpace.cpp                      |   2 +-
 Solver/functionSpace.h                        |   2 +-
 Solver/groupOfElements.cpp                    |   2 +-
 Solver/groupOfElements.h                      |   2 +-
 Solver/helmholtzTerm.h                        |   2 +-
 Solver/laplaceTerm.h                          |   2 +-
 Solver/linearSystem.cpp                       |   2 +-
 Solver/linearSystem.h                         |   2 +-
 Solver/linearSystemCSR.cpp                    |   2 +-
 Solver/linearSystemCSR.h                      |   2 +-
 Solver/linearSystemFull.h                     |   2 +-
 Solver/linearSystemGMM.h                      |   2 +-
 Solver/linearSystemMUMPS.cpp                  |   2 +-
 Solver/linearSystemMUMPS.h                    |   2 +-
 Solver/linearSystemPETSc.cpp                  |   2 +-
 Solver/linearSystemPETSc.h                    |   2 +-
 Solver/materialLaw.h                          |   2 +-
 Solver/multiscaleLaplace.cpp                  |   2 +-
 Solver/multiscaleLaplace.h                    |   2 +-
 Solver/orthogonalTerm.h                       |   2 +-
 Solver/quadratureRules.h                      |   2 +-
 Solver/solverAlgorithms.h                     |   2 +-
 Solver/solverField.h                          |   2 +-
 Solver/sparsityPattern.cpp                    |   2 +-
 Solver/sparsityPattern.h                      |   2 +-
 Solver/terms.cpp                              |   2 +-
 Solver/terms.h                                |   2 +-
 Solver/terms.hpp                              |   2 +-
 Solver/thermicSolver.cpp                      |   2 +-
 Solver/thermicSolver.h                        |   2 +-
 benchmarks/extrude_quadtri/READMEQUADTRI.txt  |   2 +-
 benchmarks/extrude_quadtri/nico_torus.geo     |   4 +-
 contrib/ANN/CMakeLists.txt                    |   2 +-
 contrib/Chaco/CMakeLists.txt                  |   2 +-
 contrib/Chaco/main/Gmsh_exit.cpp              |   2 +-
 contrib/Chaco/main/Gmsh_exit.h                |   2 +-
 contrib/Chaco/main/Gmsh_printf.cpp            |   2 +-
 contrib/Chaco/main/Gmsh_printf.h              |   2 +-
 contrib/DiscreteIntegration/CMakeLists.txt    |   2 +-
 contrib/HighOrderMeshOptimizer/CMakeLists.txt |   2 +-
 contrib/HighOrderMeshOptimizer/OptHOM.cpp     |   2 +-
 contrib/HighOrderMeshOptimizer/OptHOM.h       |   2 +-
 .../HighOrderMeshOptimizer/OptHomElastic.cpp  |   2 +-
 .../HighOrderMeshOptimizer/OptHomElastic.h    |   2 +-
 .../OptHomFastCurving.cpp                     |   2 +-
 .../OptHomFastCurving.h                       |   2 +-
 contrib/HighOrderMeshOptimizer/OptHomMesh.cpp |   2 +-
 contrib/HighOrderMeshOptimizer/OptHomMesh.h   |   2 +-
 contrib/HighOrderMeshOptimizer/OptHomRun.cpp  |   2 +-
 contrib/HighOrderMeshOptimizer/OptHomRun.h    |   2 +-
 contrib/HighOrderMeshOptimizer/ParamCoord.cpp |   2 +-
 contrib/HighOrderMeshOptimizer/ParamCoord.h   |   2 +-
 contrib/HighOrderMeshOptimizer/SuperEl.cpp    |   2 +-
 contrib/HighOrderMeshOptimizer/SuperEl.h      |   2 +-
 contrib/MathEx/CMakeLists.txt                 |   2 +-
 contrib/MeshOptimizer/CMakeLists.txt          |   2 +-
 contrib/MeshOptimizer/MeshOpt.cpp             |   2 +-
 contrib/MeshOptimizer/MeshOpt.h               |   2 +-
 contrib/MeshOptimizer/MeshOptCommon.cpp       |   2 +-
 contrib/MeshOptimizer/MeshOptCommon.h         |   2 +-
 contrib/MeshOptimizer/MeshOptPatch.cpp        |   2 +-
 contrib/MeshOptimizer/MeshOptPatch.h          |   2 +-
 contrib/MeshOptimizer/MeshOptVertexCoord.cpp  |   2 +-
 contrib/MeshOptimizer/MeshOptVertexCoord.h    |   2 +-
 contrib/MeshOptimizer/MeshOptimizer.cpp       |   2 +-
 contrib/MeshOptimizer/MeshOptimizer.h         |   2 +-
 contrib/MeshQualityOptimizer/CMakeLists.txt   |   2 +-
 .../MeshQualityOptimizer.h                    |   2 +-
 contrib/Metis/CMakeLists.txt                  |   2 +-
 contrib/Netgen/CMakeLists.txt                 |   2 +-
 contrib/Salome/CMakeLists.txt                 |   2 +-
 contrib/Tetgen1.4/CMakeLists.txt              |   2 +-
 contrib/Tetgen1.5/CMakeLists.txt              |   2 +-
 contrib/bamg/CMakeLists.txt                   |   2 +-
 contrib/blossom/CMakeLists.txt                |   2 +-
 contrib/kbipack/CMakeLists.txt                |   2 +-
 contrib/mmg3d/CMakeLists.txt                  |   2 +-
 contrib/mobile/androidUtils.cpp               |   8 +-
 contrib/mpeg_encode/CMakeLists.txt            |   2 +-
 contrib/onelab/CMakeLists.txt                 |   2 +-
 contrib/onelab/OnelabClients.h                |   2 +-
 contrib/onelab/OnelabMessage.cpp              |   2 +-
 contrib/onelab/OnelabMessage.h                |   2 +-
 contrib/onelab/metamodel.h                    |   2 +-
 contrib/onelab/myOS.cpp                       |   2 +-
 contrib/onelab/myOS.h                         |   2 +-
 contrib/onelab/python/onelab.py               |   2 +-
 contrib/onelab2/python/onelab2.py             |   2 +-
 contrib/taucs/CMakeLists.txt                  |   2 +-
 contrib/zipper/CMakeLists.txt                 |   2 +-
 doc/gmsh.html                                 |  10 +-
 doc/texinfo/gmsh.texi                         |   2 +-
 utils/api_demos/mainHomology.cpp              |   2 +-
 utils/converters/autocad/dxf2geo.cpp          |   2 +-
 utils/converters/autocad/dxf2msh.c            |  77 ++-
 utils/converters/autocad/dxf2pos.c            |  76 +--
 utils/misc/find_missing_copyright.sh          |   2 +-
 utils/nightly/gmsh.ctest                      |   4 +-
 utils/nightly/gmsh_linux32.ctest              |   4 +-
 utils/nightly/gmsh_linux32_nightly.ctest      |   2 +-
 utils/nightly/gmsh_linux32_test.ctest         |   2 +-
 utils/nightly/gmsh_linux64.ctest              |   4 +-
 utils/nightly/gmsh_linux64_coverage.ctest     |   2 +-
 utils/nightly/gmsh_linux64_nightly.ctest      |   2 +-
 utils/nightly/gmsh_linux64_test.ctest         |   2 +-
 utils/nightly/gmsh_mac.ctest                  |   4 +-
 utils/nightly/gmsh_mac_nightly.ctest          |   2 +-
 utils/nightly/gmsh_mac_test.ctest             |   2 +-
 utils/nightly/gmsh_msvc.ctest                 |   4 +-
 utils/nightly/gmsh_msvc_nightly.ctest         |   2 +-
 utils/nightly/gmsh_win32.ctest                |   4 +-
 utils/nightly/gmsh_win32_nightly.ctest        |   2 +-
 utils/nightly/gmsh_win32_test.ctest           |   2 +-
 utils/nightly/gmsh_win64.ctest                |   4 +-
 utils/nightly/gmsh_win64_nightly.ctest        |   2 +-
 utils/nightly/gmsh_win64_test.ctest           |   2 +-
 utils/solvers/c++/GmshSocket.h                |   2 +-
 utils/solvers/c++/onelab.h                    |   2 +-
 wrappers/gmshpy/CMakeLists.txt                |   2 +-
 832 files changed, 1360 insertions(+), 1415 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2a0fd4d73..1f3e966dee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 818dd8cdc1..07d1c272a0 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_PROJECT_NAME ${CUSTOM_DROP_PROJECT})
 set(CTEST_DROP_METHOD "http")
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 19887bb984..e17854eb26 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC  
   Gmsh.cpp
diff --git a/Common/Colors.h b/Common/Colors.h
index 652c4079a1..f955384db0 100644
--- a/Common/Colors.h
+++ b/Common/Colors.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _COLORS_H_
 #define _COLORS_H_
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index ce4ff5a2a7..7666c410ad 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <string.h>
@@ -989,8 +989,8 @@ void GetOptions(int argc, char *argv[])
                 MED_NUM_MINEUR, MED_NUM_RELEASE);
 #endif
         fprintf(stderr, "Packaged by      : %s\n", GMSH_PACKAGER);
-        fprintf(stderr, "Web site         : http://www.geuz.org/gmsh/\n");
-        fprintf(stderr, "Mailing list     : gmsh@geuz.org\n");
+        fprintf(stderr, "Web site         : http://gmsh.info\n");
+        fprintf(stderr, "Mailing list     : gmsh@onelab.info\n");
         Msg::Exit(0);
       }
       else if(!strcmp(argv[i] + 1, "help") || !strcmp(argv[i] + 1, "-help")) {
diff --git a/Common/CommandLine.h b/Common/CommandLine.h
index 473ed08f91..76de8b6500 100644
--- a/Common/CommandLine.h
+++ b/Common/CommandLine.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _COMMAND_LINE_H_
 #define _COMMAND_LINE_H_
diff --git a/Common/Context.cpp b/Common/Context.cpp
index 2c2ac3bdbb..d00d8f0be8 100644
--- a/Common/Context.cpp
+++ b/Common/Context.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Common/Context.h b/Common/Context.h
index c0759dfddb..e08c318c3f 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CONTEXT_H_
 #define _CONTEXT_H_
diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index 8b3f2fa707..57b87fafb8 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Common/CreateFile.h b/Common/CreateFile.h
index 86bb04ffbc..3ed55cb0f6 100644
--- a/Common/CreateFile.h
+++ b/Common/CreateFile.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CREATE_FILE_H_
 #define _CREATE_FILE_H_
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 9c500b5985..69248ace99 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DEFAULT_OPTIONS_H_
 #define _DEFAULT_OPTIONS_H_
diff --git a/Common/GamePad.cpp b/Common/GamePad.cpp
index 02368434ad..f9af28d4b2 100644
--- a/Common/GamePad.cpp
+++ b/Common/GamePad.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 //    default map is "THRUSTMASTER FireStorm Dual Power"-like
diff --git a/Common/GamePad.h b/Common/GamePad.h
index dda16e197c..ea9d6e8e16 100644
--- a/Common/GamePad.h
+++ b/Common/GamePad.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 
diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp
index 7fb9fa81a6..c4a1449a92 100644
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <time.h>
diff --git a/Common/Gmsh.h b/Common/Gmsh.h
index 98debda065..e50a4d7f2b 100644
--- a/Common/Gmsh.h
+++ b/Common/Gmsh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_H_
 #define _GMSH_H_
diff --git a/Common/GmshConfig.h.in b/Common/GmshConfig.h.in
index 97d878986a..0ae858976d 100644
--- a/Common/GmshConfig.h.in
+++ b/Common/GmshConfig.h.in
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_CONFIG_H_
 #define _GMSH_CONFIG_H_
diff --git a/Common/GmshDefines.h b/Common/GmshDefines.h
index c9758cf5fa..85592a19fb 100644
--- a/Common/GmshDefines.h
+++ b/Common/GmshDefines.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_DEFINES_H_
 #define _GMSH_DEFINES_H_
diff --git a/Common/GmshIO.h b/Common/GmshIO.h
index 12ac54fcb7..7043915e5b 100644
--- a/Common/GmshIO.h
+++ b/Common/GmshIO.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contribued by Alexis Salzman
 
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index c228b7d46f..7b51e85ac3 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Common/GmshMessage.h b/Common/GmshMessage.h
index d0ad5a6f9f..bf6504b60c 100644
--- a/Common/GmshMessage.h
+++ b/Common/GmshMessage.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_MESSAGE_H_
 #define _GMSH_MESSAGE_H_
diff --git a/Common/GmshRemote.cpp b/Common/GmshRemote.cpp
index 3c373dbe7b..9ca7d10ec2 100644
--- a/Common/GmshRemote.cpp
+++ b/Common/GmshRemote.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Common/GmshRemote.h b/Common/GmshRemote.h
index 3637f3f562..c0077928e0 100644
--- a/Common/GmshRemote.h
+++ b/Common/GmshRemote.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_REMOTE_H_
 #define _GMSH_REMOTE_H_
diff --git a/Common/GmshSocket.h b/Common/GmshSocket.h
index 824d7f12aa..4015540075 100644
--- a/Common/GmshSocket.h
+++ b/Common/GmshSocket.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _GMSH_SOCKET_H_
 #define _GMSH_SOCKET_H_
diff --git a/Common/GmshVersion.h.in b/Common/GmshVersion.h.in
index 275b12b4b9..a66e8d076f 100644
--- a/Common/GmshVersion.h.in
+++ b/Common/GmshVersion.h.in
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_VERSION_H_
 #define _GMSH_VERSION_H_
diff --git a/Common/Hash.h b/Common/Hash.h
index 509a5e6e05..349fac3280 100644
--- a/Common/Hash.h
+++ b/Common/Hash.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HASH_H_
 #define _HASH_H_
diff --git a/Common/HashMap.h b/Common/HashMap.h
index 9be4736e9d..29ad02c79c 100644
--- a/Common/HashMap.h
+++ b/Common/HashMap.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HASH_MAP_H_
 #define _HASH_MAP_H_
diff --git a/Common/ListUtils.cpp b/Common/ListUtils.cpp
index ba0beb2d7d..691fec0915 100644
--- a/Common/ListUtils.cpp
+++ b/Common/ListUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Marc Ume
diff --git a/Common/ListUtils.h b/Common/ListUtils.h
index 3b1cc7e0d1..40d5de571f 100644
--- a/Common/ListUtils.h
+++ b/Common/ListUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LIST_UTILS_H_
 #define _LIST_UTILS_H_
diff --git a/Common/Main.cpp b/Common/Main.cpp
index d775f9088b..7e996a0ba1 100644
--- a/Common/Main.cpp
+++ b/Common/Main.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Common/MallocUtils.cpp b/Common/MallocUtils.cpp
index 34116b10c4..c46d2281ba 100644
--- a/Common/MallocUtils.cpp
+++ b/Common/MallocUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Common/MallocUtils.h b/Common/MallocUtils.h
index 82e06d73b7..8dfd4a7502 100644
--- a/Common/MallocUtils.h
+++ b/Common/MallocUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MALLOC_UTILS_H_
 #define _MALLOC_UTILS_H_
diff --git a/Common/OS.cpp b/Common/OS.cpp
index 1346ce3493..2c9825286b 100644
--- a/Common/OS.cpp
+++ b/Common/OS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // This file contains a bunch of functions that depend on OS-dependent
 // features and/or system calls
diff --git a/Common/OS.h b/Common/OS.h
index dcef3e6f41..2fae7ff237 100644
--- a/Common/OS.h
+++ b/Common/OS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OS_H_
 #define _OS_H_
diff --git a/Common/Octree.cpp b/Common/Octree.cpp
index da830e36f9..9293aed02c 100644
--- a/Common/Octree.cpp
+++ b/Common/Octree.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/Common/Octree.h b/Common/Octree.h
index 5d5c205722..2ca5a87d7c 100644
--- a/Common/Octree.h
+++ b/Common/Octree.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCTREE_H_
 #define _OCTREE_H_
diff --git a/Common/OctreeInternals.cpp b/Common/OctreeInternals.cpp
index 6d8d3643a8..10f8b92069 100644
--- a/Common/OctreeInternals.cpp
+++ b/Common/OctreeInternals.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <list>
 #include <stdio.h>
diff --git a/Common/OctreeInternals.h b/Common/OctreeInternals.h
index 2d25fbcdb6..2c13e66dba 100644
--- a/Common/OctreeInternals.h
+++ b/Common/OctreeInternals.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCTREE_INTERNALS_H_
 #define _OCTREE_INTERNALS_H_
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index f8e5fb7b18..711daa5d2b 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <string.h>
diff --git a/Common/OpenFile.h b/Common/OpenFile.h
index ecd0366404..cea05a87bb 100644
--- a/Common/OpenFile.h
+++ b/Common/OpenFile.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OPENFILE_H_
 #define _OPENFILE_H_
diff --git a/Common/Options.cpp b/Common/Options.cpp
index a2853222fb..e54d7756b9 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/Common/Options.h b/Common/Options.h
index 51e5534867..6d85ca161c 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OPTIONS_H_
 #define _OPTIONS_H_
diff --git a/Common/SmoothData.cpp b/Common/SmoothData.cpp
index 4f83ec39ce..0357536645 100644
--- a/Common/SmoothData.cpp
+++ b/Common/SmoothData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include "SmoothData.h"
diff --git a/Common/SmoothData.h b/Common/SmoothData.h
index de6346dc4b..5971927c2d 100644
--- a/Common/SmoothData.h
+++ b/Common/SmoothData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SMOOTH_DATA_H_
 #define _SMOOTH_DATA_H_
diff --git a/Common/StringUtils.cpp b/Common/StringUtils.cpp
index 0229c90fa4..0f06035d14 100644
--- a/Common/StringUtils.cpp
+++ b/Common/StringUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #if defined(__CYGWIN__)
diff --git a/Common/StringUtils.h b/Common/StringUtils.h
index bc98b4a418..629a454782 100644
--- a/Common/StringUtils.h
+++ b/Common/StringUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _STRING_UTILS_H_
 #define _STRING_UTILS_H_
diff --git a/Common/TreeUtils.cpp b/Common/TreeUtils.cpp
index e448ed35e3..e35b5e8ef3 100644
--- a/Common/TreeUtils.cpp
+++ b/Common/TreeUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Marc Ume
diff --git a/Common/TreeUtils.h b/Common/TreeUtils.h
index bf3f088606..d4b9470803 100644
--- a/Common/TreeUtils.h
+++ b/Common/TreeUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TREE_UTILS_H_
 #define _TREE_UTILS_H_
diff --git a/Common/VertexArray.cpp b/Common/VertexArray.cpp
index fa2a25899a..d227bbae86 100644
--- a/Common/VertexArray.cpp
+++ b/Common/VertexArray.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <algorithm>
diff --git a/Common/VertexArray.h b/Common/VertexArray.h
index 22f43a037a..b882b9a543 100644
--- a/Common/VertexArray.h
+++ b/Common/VertexArray.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _VERTEX_ARRAY_H_
 #define _VERTEX_ARRAY_H_
diff --git a/Common/gmshLocalNetworkClient.cpp b/Common/gmshLocalNetworkClient.cpp
index 4c67dba5ec..e90731f29b 100644
--- a/Common/gmshLocalNetworkClient.cpp
+++ b/Common/gmshLocalNetworkClient.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "Gmsh.h"
diff --git a/Common/gmshLocalNetworkClient.h b/Common/gmshLocalNetworkClient.h
index 95d0b5d5a8..777856d783 100644
--- a/Common/gmshLocalNetworkClient.h
+++ b/Common/gmshLocalNetworkClient.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_LOCAL_NETWORK_CLIENT_H_
 #define _GMSH_LOCAL_NETWORK_CLIENT_H_
diff --git a/Common/gmshPopplerWrapper.cpp b/Common/gmshPopplerWrapper.cpp
index d4856c3f88..68e76f28df 100644
--- a/Common/gmshPopplerWrapper.cpp
+++ b/Common/gmshPopplerWrapper.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "gmshPopplerWrapper.h"
 
diff --git a/Common/gmshPopplerWrapper.h b/Common/gmshPopplerWrapper.h
index 10310e447b..3da0329045 100644
--- a/Common/gmshPopplerWrapper.h
+++ b/Common/gmshPopplerWrapper.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSHPOPPLERWRAPPER_PDF_H_
 #define _GMSHPOPPLERWRAPPER_PDF_H_
diff --git a/Common/onelab.h b/Common/onelab.h
index f57eb6ec1c..0ebdb4e005 100644
--- a/Common/onelab.h
+++ b/Common/onelab.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _ONELAB_H_
 #define _ONELAB_H_
diff --git a/Common/onelabUtils.cpp b/Common/onelabUtils.cpp
index 5ad1360921..ccb5138120 100644
--- a/Common/onelabUtils.cpp
+++ b/Common/onelabUtils.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Common/onelabUtils.h b/Common/onelabUtils.h
index 26a0c42117..595b700c04 100644
--- a/Common/onelabUtils.h
+++ b/Common/onelabUtils.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ONELAB_UTILS_H_
 #define _ONELAB_UTILS_H_
diff --git a/Fltk/CMakeLists.txt b/Fltk/CMakeLists.txt
index def058869d..a8740ea4b5 100644
--- a/Fltk/CMakeLists.txt
+++ b/Fltk/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   FlGui.cpp
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index 8db38e5aa1..9a7ad00061 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/FlGui.h b/Fltk/FlGui.h
index a3ae525888..d47689577e 100644
--- a/Fltk/FlGui.h
+++ b/Fltk/FlGui.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FL_GUI_H_
 #define _FL_GUI_H_
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index e07b601cb1..d708f7d6e6 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string>
diff --git a/Fltk/Navigator.cpp b/Fltk/Navigator.cpp
index 8ae9d1089b..4e281c6c6f 100644
--- a/Fltk/Navigator.cpp
+++ b/Fltk/Navigator.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 
diff --git a/Fltk/Navigator.h b/Fltk/Navigator.h
index 20029a1288..2814ff3acd 100644
--- a/Fltk/Navigator.h
+++ b/Fltk/Navigator.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 //
diff --git a/Fltk/classificationEditor.cpp b/Fltk/classificationEditor.cpp
index 9ab8aa9ac4..6660df828a 100644
--- a/Fltk/classificationEditor.cpp
+++ b/Fltk/classificationEditor.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Box.H>
diff --git a/Fltk/classificationEditor.h b/Fltk/classificationEditor.h
index 434f52025b..2e929c7d2f 100644
--- a/Fltk/classificationEditor.h
+++ b/Fltk/classificationEditor.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CLASSIFICATION_EDITOR_H_
 #define _CLASSIFICATION_EDITOR_H_
diff --git a/Fltk/clippingWindow.cpp b/Fltk/clippingWindow.cpp
index 8a873e41ef..ed435f023b 100644
--- a/Fltk/clippingWindow.cpp
+++ b/Fltk/clippingWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Return_Button.H>
diff --git a/Fltk/clippingWindow.h b/Fltk/clippingWindow.h
index 8f83e42e15..6b5d489dd4 100644
--- a/Fltk/clippingWindow.h
+++ b/Fltk/clippingWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CLIPPING_WINDOW_H_
 #define _CLIPPING_WINDOW_H_
diff --git a/Fltk/colorbarWindow.cpp b/Fltk/colorbarWindow.cpp
index 090fe26cfd..60b1881f13 100644
--- a/Fltk/colorbarWindow.cpp
+++ b/Fltk/colorbarWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // This class was inspired by the colorbar widget provided in Vis5d, a
 // program for visualizing five dimensional gridded data sets
diff --git a/Fltk/colorbarWindow.h b/Fltk/colorbarWindow.h
index d61c050590..9583689321 100644
--- a/Fltk/colorbarWindow.h
+++ b/Fltk/colorbarWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _COLORBAR_WINDOW_H
 #define _COLORBAR_WINDOW_H
diff --git a/Fltk/contextWindow.cpp b/Fltk/contextWindow.cpp
index 17728a3cf2..c5326893e9 100644
--- a/Fltk/contextWindow.cpp
+++ b/Fltk/contextWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Return_Button.H>
diff --git a/Fltk/contextWindow.h b/Fltk/contextWindow.h
index f0e6d86b70..b2406db058 100644
--- a/Fltk/contextWindow.h
+++ b/Fltk/contextWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CONTEXT_WINDOW_H_
 #define _CONTEXT_WINDOW_H_
diff --git a/Fltk/drawContextFltk.h b/Fltk/drawContextFltk.h
index 9681d6d62c..c3babe88f5 100644
--- a/Fltk/drawContextFltk.h
+++ b/Fltk/drawContextFltk.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DRAW_CONTEXT_FLTK_H_
 #define _DRAW_CONTEXT_FLTK_H_
diff --git a/Fltk/drawContextFltkCairo.cpp b/Fltk/drawContextFltkCairo.cpp
index 23db76ffb2..c10e3badf7 100644
--- a/Fltk/drawContextFltkCairo.cpp
+++ b/Fltk/drawContextFltkCairo.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Jonathan Lambrechts
 
diff --git a/Fltk/drawContextFltkCairo.h b/Fltk/drawContextFltkCairo.h
index dd7f9f9a5a..02150f7bb0 100644
--- a/Fltk/drawContextFltkCairo.h
+++ b/Fltk/drawContextFltkCairo.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Jonathan Lambrechts
 
diff --git a/Fltk/drawContextFltkStringTexture.cpp b/Fltk/drawContextFltkStringTexture.cpp
index 7d45ce19fc..81b90ca173 100644
--- a/Fltk/drawContextFltkStringTexture.cpp
+++ b/Fltk/drawContextFltkStringTexture.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Jonathan Lambrechts
 
diff --git a/Fltk/drawContextFltkStringTexture.h b/Fltk/drawContextFltkStringTexture.h
index 2846e99ff6..1b6924efa1 100644
--- a/Fltk/drawContextFltkStringTexture.h
+++ b/Fltk/drawContextFltkStringTexture.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Jonathan Lambrechts
 
diff --git a/Fltk/extraDialogs.cpp b/Fltk/extraDialogs.cpp
index f7e94f5324..fda24f3d84 100644
--- a/Fltk/extraDialogs.cpp
+++ b/Fltk/extraDialogs.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Stephen Guzik
diff --git a/Fltk/extraDialogs.h b/Fltk/extraDialogs.h
index 4ca1abf7a6..e47e280eea 100644
--- a/Fltk/extraDialogs.h
+++ b/Fltk/extraDialogs.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EXTRA_DIALOGS_H_
 #define _EXTRA_DIALOGS_H_
diff --git a/Fltk/fieldWindow.cpp b/Fltk/fieldWindow.cpp
index 0d2231e009..0b72b7f569 100644
--- a/Fltk/fieldWindow.cpp
+++ b/Fltk/fieldWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Jonathan Lambrechts
diff --git a/Fltk/fieldWindow.h b/Fltk/fieldWindow.h
index fb72de1d79..ee3b7674d7 100644
--- a/Fltk/fieldWindow.h
+++ b/Fltk/fieldWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIELD_WINDOW_H_
 #define _FIELD_WINDOW_H_
diff --git a/Fltk/fileDialogs.cpp b/Fltk/fileDialogs.cpp
index 4bc0e7ea8d..2f91a14127 100644
--- a/Fltk/fileDialogs.cpp
+++ b/Fltk/fileDialogs.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Stephen Guzik
diff --git a/Fltk/fileDialogs.h b/Fltk/fileDialogs.h
index 58b7543623..c26783865d 100644
--- a/Fltk/fileDialogs.h
+++ b/Fltk/fileDialogs.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FILE_DIALOGS_H_
 #define _FILE_DIALOGS_H_
diff --git a/Fltk/gamepadWindow.cpp b/Fltk/gamepadWindow.cpp
index 064dfcfbaa..4c6544ffcb 100644
--- a/Fltk/gamepadWindow.cpp
+++ b/Fltk/gamepadWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/gamepadWindow.h b/Fltk/gamepadWindow.h
index 210c1ed100..63a788a5b2 100644
--- a/Fltk/gamepadWindow.h
+++ b/Fltk/gamepadWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GAMEPAD_WINDOW_H_
 #define _GAMEPAD_WINDOW_H_
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 4198fc3d2d..1072ff4c2f 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshDefines.h"
@@ -324,8 +324,8 @@ static int _save_view_med(const char *name){ return genericViewFileDialog
 static int _save_view_txt(const char *name){ return genericViewFileDialog
     (name, "TXT Options", 4); }
 
-//static int _save_view_wrl(const char *name){ return genericViewFileDialog    (name, "X3D Options", 7); } 
-static int _save_view_x3d(const char *name){ return x3dViewFileDialog    (name, "X3D Options", 7); } 
+//static int _save_view_wrl(const char *name){ return genericViewFileDialog    (name, "X3D Options", 7); }
+static int _save_view_x3d(const char *name){ return x3dViewFileDialog    (name, "X3D Options", 7); }
 
 
 static int _save_auto(const char *name)
@@ -551,7 +551,7 @@ void file_watch_cb(Fl_Widget *w, void *data)
 
 static void help_online_cb(Fl_Widget *w, void *data)
 {
-  fl_open_uri("http://geuz.org/gmsh/doc/texinfo/");
+  fl_open_uri("http://gmsh.info/doc/texinfo/");
 }
 
 static void help_basic_cb(Fl_Widget *w, void *data)
diff --git a/Fltk/graphicWindow.h b/Fltk/graphicWindow.h
index 319a01c576..58b2da58ff 100644
--- a/Fltk/graphicWindow.h
+++ b/Fltk/graphicWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GRAPHIC_WINDOW_H_
 #define _GRAPHIC_WINDOW_H_
diff --git a/Fltk/helpWindow.cpp b/Fltk/helpWindow.cpp
index ecb18d59b6..9d7074e1f6 100644
--- a/Fltk/helpWindow.cpp
+++ b/Fltk/helpWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <algorithm>
@@ -301,11 +301,11 @@ helpWindow::helpWindow()
     sstream << "<center><h3>Gmsh</h3><br>version " << GetGmshVersion()
             << "<p>Copyright (C) 1997-2016"
             << "<br>Christophe Geuzaine and Jean-Francois Remacle"
-            << "<p><a href=\"http://geuz.org/gmsh/doc/CREDITS.txt\">Credits</a> "
-            << "and <a href=\"http://geuz.org/gmsh/doc/LICENSE.txt\">licensing "
+            << "<p><a href=\"http://gmsh.info/doc/CREDITS.txt\">Credits</a> "
+            << "and <a href=\"http://gmsh.info/doc/LICENSE.txt\">licensing "
             << "information</a>"
             << "<p>Please send all questions and bug reports to the public mailing list "
-            << "<a href=\"mailto:gmsh@geuz.org\">gmsh@geuz.org</a></center>"
+            << "<a href=\"mailto:gmsh@onelab.info\">gmsh@onelab.info</a></center>"
             << "<ul>"
             << "<li><i>Build OS:</i> " << GetGmshBuildOS()
             << "<li><i>Build date:</i> " << GetGmshBuildDate()
@@ -332,7 +332,7 @@ helpWindow::helpWindow()
 #endif
             << "<li><i>Packaged by:</i> " << GetGmshPackager()
             << "</ul>"
-            << "<center>Visit <a href=\"http://geuz.org/gmsh/\">http://geuz.org/gmsh/</a> "
+            << "<center>Visit <a href=\"http://gmsh.info\">http://gmsh.info</a> "
             << "for more information</center>";
     o->value(sstream.str().c_str());
     o->link(help_link);
diff --git a/Fltk/helpWindow.h b/Fltk/helpWindow.h
index 7a7d89e5cf..27a874fcf6 100644
--- a/Fltk/helpWindow.h
+++ b/Fltk/helpWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HELP_WINDOW_H_
 #define _HELP_WINDOW_H_
diff --git a/Fltk/highOrderToolsWindow.cpp b/Fltk/highOrderToolsWindow.cpp
index 6b11d2f3a6..0cb2a7ae59 100644
--- a/Fltk/highOrderToolsWindow.cpp
+++ b/Fltk/highOrderToolsWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include <string>
diff --git a/Fltk/highOrderToolsWindow.h b/Fltk/highOrderToolsWindow.h
index 0926c0fd3f..ca10307b98 100644
--- a/Fltk/highOrderToolsWindow.h
+++ b/Fltk/highOrderToolsWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HIGHORDERTOOLS_WINDOW_H_
 #define _HIGHORDERTOOLS_WINDOW_H_
diff --git a/Fltk/inputRange.h b/Fltk/inputRange.h
index 3894a7e709..bc928f7a4a 100644
--- a/Fltk/inputRange.h
+++ b/Fltk/inputRange.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INPUT_RANGE_H_
 #define _INPUT_RANGE_H_
diff --git a/Fltk/inputRegion.cpp b/Fltk/inputRegion.cpp
index ce4e79e57a..2e1f21e52a 100644
--- a/Fltk/inputRegion.cpp
+++ b/Fltk/inputRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <stdio.h>
diff --git a/Fltk/inputRegion.h b/Fltk/inputRegion.h
index 184c70c3cc..e510780168 100644
--- a/Fltk/inputRegion.h
+++ b/Fltk/inputRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INPUT_REGION_H_
 #define _INPUT_REGION_H_
diff --git a/Fltk/inputValue.cpp b/Fltk/inputValue.cpp
index 2eaa9e7016..972f469b91 100644
--- a/Fltk/inputValue.cpp
+++ b/Fltk/inputValue.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "inputValue.h"
 #include <FL/Fl_Group.H>
diff --git a/Fltk/inputValue.h b/Fltk/inputValue.h
index 83a65a0ee1..103429423c 100644
--- a/Fltk/inputValue.h
+++ b/Fltk/inputValue.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INPUT_VALUE_H_
 #define _INPUT_VALUE_H_
diff --git a/Fltk/mainWindow.h b/Fltk/mainWindow.h
index be1dda9675..c4e588bd43 100644
--- a/Fltk/mainWindow.h
+++ b/Fltk/mainWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MAIN_WINDOW_H
 #define _MAIN_WINDOW_H
diff --git a/Fltk/manipWindow.cpp b/Fltk/manipWindow.cpp
index 7d83b457aa..aa3f7dac57 100644
--- a/Fltk/manipWindow.cpp
+++ b/Fltk/manipWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Return_Button.H>
diff --git a/Fltk/manipWindow.h b/Fltk/manipWindow.h
index 5b8da2afd4..1df9ca048a 100644
--- a/Fltk/manipWindow.h
+++ b/Fltk/manipWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MANIP_WINDOW_H_
 #define _MANIP_WINDOW_H_
diff --git a/Fltk/onelabGroup.cpp b/Fltk/onelabGroup.cpp
index 9f21c286cf..933a124f98 100644
--- a/Fltk/onelabGroup.cpp
+++ b/Fltk/onelabGroup.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl.H>
 #include "GmshConfig.h"
diff --git a/Fltk/onelabGroup.h b/Fltk/onelabGroup.h
index 494bf3f92b..271e7c3833 100644
--- a/Fltk/onelabGroup.h
+++ b/Fltk/onelabGroup.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ONELAB_GROUP_H_
 #define _ONELAB_GROUP_H_
diff --git a/Fltk/openglWindow.cpp b/Fltk/openglWindow.cpp
index 3b704c9690..f4b22ed4ee 100644
--- a/Fltk/openglWindow.cpp
+++ b/Fltk/openglWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <string.h>
diff --git a/Fltk/openglWindow.h b/Fltk/openglWindow.h
index bc907d3499..bbcb70581d 100644
--- a/Fltk/openglWindow.h
+++ b/Fltk/openglWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OPENGL_WINDOW_H_
 #define _OPENGL_WINDOW_H_
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 95d1333c93..4b18405f4c 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/optionWindow.h b/Fltk/optionWindow.h
index fc1f3d36c5..b6eda4318a 100644
--- a/Fltk/optionWindow.h
+++ b/Fltk/optionWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OPTION_WINDOW_H_
 #define _OPTION_WINDOW_H_
diff --git a/Fltk/outputRange.h b/Fltk/outputRange.h
index 89e7fb558e..b2d1010765 100644
--- a/Fltk/outputRange.h
+++ b/Fltk/outputRange.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OUTPUT_RANGE_H_
 #define _OUTPUT_RANGE_H_
diff --git a/Fltk/paletteWindow.h b/Fltk/paletteWindow.h
index fc85b1a022..76f6da93e9 100644
--- a/Fltk/paletteWindow.h
+++ b/Fltk/paletteWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PALETTE_WINDOW_H
 #define _PALETTE_WINDOW_H
diff --git a/Fltk/partitionDialog.cpp b/Fltk/partitionDialog.cpp
index b9955381bc..fa6345420d 100644
--- a/Fltk/partitionDialog.cpp
+++ b/Fltk/partitionDialog.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Stephen Guzik
diff --git a/Fltk/partitionDialog.h b/Fltk/partitionDialog.h
index 73fae75397..60d28471a9 100644
--- a/Fltk/partitionDialog.h
+++ b/Fltk/partitionDialog.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTITION_DIALOG_H_
 #define _PARTITION_DIALOG_H_
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 9b29911be5..910c7d9adf 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/pluginWindow.h b/Fltk/pluginWindow.h
index 4a199ded23..bcd2830a73 100644
--- a/Fltk/pluginWindow.h
+++ b/Fltk/pluginWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PLUGIN_WINDOW_H_
 #define _PLUGIN_WINDOW_H_
diff --git a/Fltk/projectionEditor.cpp b/Fltk/projectionEditor.cpp
index 258bd1e900..0354da12eb 100644
--- a/Fltk/projectionEditor.cpp
+++ b/Fltk/projectionEditor.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <FL/fl_draw.H>
diff --git a/Fltk/projectionEditor.h b/Fltk/projectionEditor.h
index ee18403cd6..b60518649f 100644
--- a/Fltk/projectionEditor.h
+++ b/Fltk/projectionEditor.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PROJECTION_EDITOR_H_
 #define _PROJECTION_EDITOR_H_
diff --git a/Fltk/solverButton.cpp b/Fltk/solverButton.cpp
index 47e5a44276..a24f7559c8 100644
--- a/Fltk/solverButton.cpp
+++ b/Fltk/solverButton.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "FlGui.h"
diff --git a/Fltk/solverButton.h b/Fltk/solverButton.h
index 67822b3f46..44781ed5b0 100644
--- a/Fltk/solverButton.h
+++ b/Fltk/solverButton.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SOLVER_BUTTON_H_
 #define _SOLVER_BUTTON_H_
diff --git a/Fltk/spherePositionWidget.h b/Fltk/spherePositionWidget.h
index 81d5652f11..e6d3294d70 100644
--- a/Fltk/spherePositionWidget.h
+++ b/Fltk/spherePositionWidget.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPHERE_POSITION_WIDGET_H_
 #define _SPHERE_POSITION_WIDGET_H_
diff --git a/Fltk/statisticsWindow.cpp b/Fltk/statisticsWindow.cpp
index 948d75ae2f..b1f07468d8 100644
--- a/Fltk/statisticsWindow.cpp
+++ b/Fltk/statisticsWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Box.H>
diff --git a/Fltk/statisticsWindow.h b/Fltk/statisticsWindow.h
index 25493097aa..02f5cd22c4 100644
--- a/Fltk/statisticsWindow.h
+++ b/Fltk/statisticsWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _STATISTICS_WINDOW_H_
 #define _STATISTICS_WINDOW_H_
diff --git a/Fltk/treeIcons.h b/Fltk/treeIcons.h
index 7c9ac1cdf5..994b706926 100644
--- a/Fltk/treeIcons.h
+++ b/Fltk/treeIcons.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TREE_ICONS_H_
 #define _TREE_ICONS_H_
diff --git a/Fltk/viewButton.cpp b/Fltk/viewButton.cpp
index 3070ddcb26..ceb62494e0 100644
--- a/Fltk/viewButton.cpp
+++ b/Fltk/viewButton.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <FL/fl_ask.H>
 #include "FlGui.h"
diff --git a/Fltk/viewButton.h b/Fltk/viewButton.h
index 54367f353d..b18d357ca7 100644
--- a/Fltk/viewButton.h
+++ b/Fltk/viewButton.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _VIEW_BUTTON_H_
 #define _VIEW_BUTTON_H_
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 855ec42720..2aff31dda8 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
diff --git a/Fltk/visibilityWindow.h b/Fltk/visibilityWindow.h
index f9ae34e6dd..5946ebc75a 100644
--- a/Fltk/visibilityWindow.h
+++ b/Fltk/visibilityWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _VISIBILITY_WINDOW_H_
 #define _VISIBILITY_WINDOW_H_
diff --git a/FunctionSpace/CMakeLists.txt b/FunctionSpace/CMakeLists.txt
index d7f2859366..167742fe33 100644
--- a/FunctionSpace/CMakeLists.txt
+++ b/FunctionSpace/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Polynomial.cpp
diff --git a/Geo/ACISEdge.cpp b/Geo/ACISEdge.cpp
index d6d40403ce..0c87296e9c 100644
--- a/Geo/ACISEdge.cpp
+++ b/Geo/ACISEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <limits>
 #include "GmshConfig.h"
diff --git a/Geo/ACISEdge.h b/Geo/ACISEdge.h
index 372cf952d0..e27e74bfe1 100644
--- a/Geo/ACISEdge.h
+++ b/Geo/ACISEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ACIS_EDGE_H_
 #define _ACIS_EDGE_H_
diff --git a/Geo/ACISFace.cpp b/Geo/ACISFace.cpp
index 5346160fc9..e4402bbfc7 100644
--- a/Geo/ACISFace.cpp
+++ b/Geo/ACISFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/ACISFace.h b/Geo/ACISFace.h
index 24616d9840..55143ae07a 100644
--- a/Geo/ACISFace.h
+++ b/Geo/ACISFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ACIS_FACE_H_
 #define _ACIS_FACE_H_
diff --git a/Geo/ACISVertex.cpp b/Geo/ACISVertex.cpp
index 58d2439f75..84d0c76083 100644
--- a/Geo/ACISVertex.cpp
+++ b/Geo/ACISVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "ACISVertex.h"
 #include "MPoint.h"
diff --git a/Geo/ACISVertex.h b/Geo/ACISVertex.h
index ce76a858cf..3734b2e0c4 100644
--- a/Geo/ACISVertex.h
+++ b/Geo/ACISVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ACIS_VERTEX_H_
 #define _ACIS_VERTEX_H_
diff --git a/Geo/CGNSOptions.h b/Geo/CGNSOptions.h
index 807f0effcb..df3b7118b4 100644
--- a/Geo/CGNSOptions.h
+++ b/Geo/CGNSOptions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // CGNSOptions.h - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/CMakeLists.txt b/Geo/CMakeLists.txt
index bc89d0de70..110c6a8a2a 100644
--- a/Geo/CMakeLists.txt
+++ b/Geo/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   boundaryLayersData.cpp
diff --git a/Geo/Cell.cpp b/Geo/Cell.cpp
index d4d80f9627..fd9b3e894e 100644
--- a/Geo/Cell.cpp
+++ b/Geo/Cell.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Cell.h b/Geo/Cell.h
index 3ea1ddb240..f2a66c7829 100644
--- a/Geo/Cell.h
+++ b/Geo/Cell.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/CellComplex.cpp b/Geo/CellComplex.cpp
index fa3ea19b67..95001200b9 100644
--- a/Geo/CellComplex.cpp
+++ b/Geo/CellComplex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/CellComplex.h b/Geo/CellComplex.h
index fa4b16152c..76bedfa5ea 100644
--- a/Geo/CellComplex.h
+++ b/Geo/CellComplex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Chain.cpp b/Geo/Chain.cpp
index b92e00d957..5892c6942e 100644
--- a/Geo/Chain.cpp
+++ b/Geo/Chain.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Chain.h b/Geo/Chain.h
index 18bf4b9855..06df3709dd 100644
--- a/Geo/Chain.h
+++ b/Geo/Chain.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/ChainComplex.cpp b/Geo/ChainComplex.cpp
index 430b58a50f..91e2e6264c 100644
--- a/Geo/ChainComplex.cpp
+++ b/Geo/ChainComplex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/ChainComplex.h b/Geo/ChainComplex.h
index 66877a1f48..38b301bc00 100644
--- a/Geo/ChainComplex.h
+++ b/Geo/ChainComplex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Curvature.cpp b/Geo/Curvature.cpp
index 0069f8e2a3..0c734c84a8 100644
--- a/Geo/Curvature.cpp
+++ b/Geo/Curvature.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Curvature.h"
 #include "MElement.h"
diff --git a/Geo/Curvature.h b/Geo/Curvature.h
index 297ec832d3..0dd30d0ca1 100644
--- a/Geo/Curvature.h
+++ b/Geo/Curvature.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CURVATURE_H_
 #define _CURVATURE_H_
diff --git a/Geo/CustomContainer.h b/Geo/CustomContainer.h
index 1130656f19..b4e8066f2c 100644
--- a/Geo/CustomContainer.h
+++ b/Geo/CustomContainer.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // CustomContainer.h - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/ExtrudeParams.cpp b/Geo/ExtrudeParams.cpp
index 14c054661e..7d02f5db06 100644
--- a/Geo/ExtrudeParams.cpp
+++ b/Geo/ExtrudeParams.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "Geo.h"
diff --git a/Geo/ExtrudeParams.h b/Geo/ExtrudeParams.h
index c20c5ab822..ed7e73fbc9 100644
--- a/Geo/ExtrudeParams.h
+++ b/Geo/ExtrudeParams.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EXTRUDE_PARAMS_H_
 #define _EXTRUDE_PARAMS_H_
diff --git a/Geo/GEdge.cpp b/Geo/GEdge.cpp
index 000dedde51..e8bd05b0b0 100644
--- a/Geo/GEdge.cpp
+++ b/Geo/GEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <algorithm>
diff --git a/Geo/GEdge.h b/Geo/GEdge.h
index 2923740933..009f4a488f 100644
--- a/Geo/GEdge.h
+++ b/Geo/GEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEDGE_H_
 #define _GEDGE_H_
diff --git a/Geo/GEdgeCompound.cpp b/Geo/GEdgeCompound.cpp
index eca8642329..60df47ebe4 100644
--- a/Geo/GEdgeCompound.cpp
+++ b/Geo/GEdgeCompound.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Geo/GEdgeCompound.h b/Geo/GEdgeCompound.h
index af8d3d21b2..3efdc13a30 100644
--- a/Geo/GEdgeCompound.h
+++ b/Geo/GEdgeCompound.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEDGE_COMPOUND_H_
 #define _GEDGE_COMPOUND_H_
diff --git a/Geo/GEdgeLoop.cpp b/Geo/GEdgeLoop.cpp
index 3ac2863d36..de12a51125 100644
--- a/Geo/GEdgeLoop.cpp
+++ b/Geo/GEdgeLoop.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include <functional>
diff --git a/Geo/GEdgeLoop.h b/Geo/GEdgeLoop.h
index 1e10d1d2ed..54982ceed2 100644
--- a/Geo/GEdgeLoop.h
+++ b/Geo/GEdgeLoop.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEDGE_LOOP_H_
 #define _GEDGE_LOOP_H_
diff --git a/Geo/GEntity.cpp b/Geo/GEntity.cpp
index 6ecd8537eb..fdbcae3f66 100644
--- a/Geo/GEntity.cpp
+++ b/Geo/GEntity.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include "GModel.h"
diff --git a/Geo/GEntity.h b/Geo/GEntity.h
index 33a7db7542..98cb3703ec 100644
--- a/Geo/GEntity.h
+++ b/Geo/GEntity.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GENTITY_H_
 #define _GENTITY_H_
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index c1d7041d76..f7230c902f 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include "GmshConfig.h"
diff --git a/Geo/GFace.h b/Geo/GFace.h
index 373ab625f7..237c5a8366 100644
--- a/Geo/GFace.h
+++ b/Geo/GFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GFACE_H_
 #define _GFACE_H_
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index d53ed3dc88..abf1d2764e 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Geo/GFaceCompound.h b/Geo/GFaceCompound.h
index 919a0e388f..fe28e52098 100644
--- a/Geo/GFaceCompound.h
+++ b/Geo/GFaceCompound.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GFACE_COMPOUND_H_
 #define _GFACE_COMPOUND_H_
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 5311e77421..c58449c50a 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <limits>
 #include <stdlib.h>
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 216b816ac7..e5e4309341 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODEL_H_
 #define _GMODEL_H_
diff --git a/Geo/GModelFactory.cpp b/Geo/GModelFactory.cpp
index 94e7a2f3dd..783d716d20 100644
--- a/Geo/GModelFactory.cpp
+++ b/Geo/GModelFactory.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GModelFactory.h"
diff --git a/Geo/GModelFactory.h b/Geo/GModelFactory.h
index e4ecf361c3..1aee7a9b3b 100644
--- a/Geo/GModelFactory.h
+++ b/Geo/GModelFactory.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODEL_FACTORY_H_
 #define _GMODEL_FACTORY_H_
diff --git a/Geo/GModelIO_ACIS.cpp b/Geo/GModelIO_ACIS.cpp
index 25c5a31914..c74ecef763 100644
--- a/Geo/GModelIO_ACIS.cpp
+++ b/Geo/GModelIO_ACIS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GModel.h"
diff --git a/Geo/GModelIO_ACTRAN.cpp b/Geo/GModelIO_ACTRAN.cpp
index 380f6c1cab..cece167830 100644
--- a/Geo/GModelIO_ACTRAN.cpp
+++ b/Geo/GModelIO_ACTRAN.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_BDF.cpp b/Geo/GModelIO_BDF.cpp
index 38e13167fc..33f3d658bf 100644
--- a/Geo/GModelIO_BDF.cpp
+++ b/Geo/GModelIO_BDF.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_CELUM.cpp b/Geo/GModelIO_CELUM.cpp
index 79783b7689..499fb12138 100644
--- a/Geo/GModelIO_CELUM.cpp
+++ b/Geo/GModelIO_CELUM.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_CGNS.cpp b/Geo/GModelIO_CGNS.cpp
index 896b214652..880fb790be 100644
--- a/Geo/GModelIO_CGNS.cpp
+++ b/Geo/GModelIO_CGNS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // GModelIO_CGNS.cpp - Copyright (C) 2008-2012 S. Guzik, B. Gorissen, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/GModelIO_DIFF.cpp b/Geo/GModelIO_DIFF.cpp
index 6fbed40506..c3f4e69af3 100644
--- a/Geo/GModelIO_DIFF.cpp
+++ b/Geo/GModelIO_DIFF.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_Fourier.cpp b/Geo/GModelIO_Fourier.cpp
index 658b6a6e33..11c0763960 100644
--- a/Geo/GModelIO_Fourier.cpp
+++ b/Geo/GModelIO_Fourier.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include "GmshConfig.h"
diff --git a/Geo/GModelIO_Fourier.h b/Geo/GModelIO_Fourier.h
index 01d83860d9..70d3df79c3 100644
--- a/Geo/GModelIO_Fourier.h
+++ b/Geo/GModelIO_Fourier.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODEL_IO_FOURIER_H_
 #define _GMODEL_IO_FOURIER_H_
diff --git a/Geo/GModelIO_GEO.cpp b/Geo/GModelIO_GEO.cpp
index e50ff36bfe..e6f7f9645f 100644
--- a/Geo/GModelIO_GEO.cpp
+++ b/Geo/GModelIO_GEO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <stdlib.h>
diff --git a/Geo/GModelIO_GEOM.cpp b/Geo/GModelIO_GEOM.cpp
index d15a433469..cd5d48759e 100644
--- a/Geo/GModelIO_GEOM.cpp
+++ b/Geo/GModelIO_GEOM.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_INP.cpp b/Geo/GModelIO_INP.cpp
index 6db40d3ecb..b46b64fd5d 100644
--- a/Geo/GModelIO_INP.cpp
+++ b/Geo/GModelIO_INP.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_IR3.cpp b/Geo/GModelIO_IR3.cpp
index fa8338f510..abc96a8794 100644
--- a/Geo/GModelIO_IR3.cpp
+++ b/Geo/GModelIO_IR3.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_MAIL.cpp b/Geo/GModelIO_MAIL.cpp
index 66fff89148..2d5f95b6d6 100644
--- a/Geo/GModelIO_MAIL.cpp
+++ b/Geo/GModelIO_MAIL.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_MED.cpp b/Geo/GModelIO_MED.cpp
index b00433bd82..d580cde4e2 100644
--- a/Geo/GModelIO_MED.cpp
+++ b/Geo/GModelIO_MED.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include "GmshConfig.h"
diff --git a/Geo/GModelIO_MESH.cpp b/Geo/GModelIO_MESH.cpp
index e8e5f74878..c0b517d33e 100644
--- a/Geo/GModelIO_MESH.cpp
+++ b/Geo/GModelIO_MESH.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_MSH.cpp b/Geo/GModelIO_MSH.cpp
index 1c6a7af1de..34656bf3b0 100644
--- a/Geo/GModelIO_MSH.cpp
+++ b/Geo/GModelIO_MSH.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <iomanip>
diff --git a/Geo/GModelIO_MSH2.cpp b/Geo/GModelIO_MSH2.cpp
index 3816262af5..2ea895cd8f 100644
--- a/Geo/GModelIO_MSH2.cpp
+++ b/Geo/GModelIO_MSH2.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp
index d0ce4e50ee..060e18405e 100644
--- a/Geo/GModelIO_OCC.cpp
+++ b/Geo/GModelIO_OCC.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/GModelIO_OCC.h b/Geo/GModelIO_OCC.h
index 72387cd7f6..000ec2901a 100644
--- a/Geo/GModelIO_OCC.h
+++ b/Geo/GModelIO_OCC.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODELIO_OCC_H_
 #define _GMODELIO_OCC_H_
diff --git a/Geo/GModelIO_P3D.cpp b/Geo/GModelIO_P3D.cpp
index b7f0ec43de..352440fbba 100644
--- a/Geo/GModelIO_P3D.cpp
+++ b/Geo/GModelIO_P3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelIO_PLY.cpp b/Geo/GModelIO_PLY.cpp
index e3c6a933ec..10edd962c9 100644
--- a/Geo/GModelIO_PLY.cpp
+++ b/Geo/GModelIO_PLY.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_POS.cpp b/Geo/GModelIO_POS.cpp
index f63af6e036..9c77c65fbc 100644
--- a/Geo/GModelIO_POS.cpp
+++ b/Geo/GModelIO_POS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include "GModel.h"
diff --git a/Geo/GModelIO_SGEOM.cpp b/Geo/GModelIO_SGEOM.cpp
index 13c552adc6..6fd691dca7 100644
--- a/Geo/GModelIO_SGEOM.cpp
+++ b/Geo/GModelIO_SGEOM.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/GModelIO_SGEOM.h b/Geo/GModelIO_SGEOM.h
index b2d7fd2a86..04b17f5d3c 100644
--- a/Geo/GModelIO_SGEOM.h
+++ b/Geo/GModelIO_SGEOM.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMODELIO_SGEOM_H_
 #define _GMODELIO_SGEOM_H_
diff --git a/Geo/GModelIO_STL.cpp b/Geo/GModelIO_STL.cpp
index b5d570f864..a684d6e5dc 100644
--- a/Geo/GModelIO_STL.cpp
+++ b/Geo/GModelIO_STL.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include "GModel.h"
diff --git a/Geo/GModelIO_SU2.cpp b/Geo/GModelIO_SU2.cpp
index e6692cb093..4b2e32363b 100644
--- a/Geo/GModelIO_SU2.cpp
+++ b/Geo/GModelIO_SU2.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_UNV.cpp b/Geo/GModelIO_UNV.cpp
index bc296563f2..bff33014db 100644
--- a/Geo/GModelIO_UNV.cpp
+++ b/Geo/GModelIO_UNV.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_VRML.cpp b/Geo/GModelIO_VRML.cpp
index 221a5e6e2a..9797885ef8 100644
--- a/Geo/GModelIO_VRML.cpp
+++ b/Geo/GModelIO_VRML.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/GModelIO_VTK.cpp b/Geo/GModelIO_VTK.cpp
index 11a800a5c6..98ec063c75 100644
--- a/Geo/GModelIO_VTK.cpp
+++ b/Geo/GModelIO_VTK.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "OS.h"
diff --git a/Geo/GModelVertexArrays.cpp b/Geo/GModelVertexArrays.cpp
index 162b555160..45ea2b83f6 100644
--- a/Geo/GModelVertexArrays.cpp
+++ b/Geo/GModelVertexArrays.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GmshMessage.h"
diff --git a/Geo/GPoint.h b/Geo/GPoint.h
index e85d8dfdee..b666bf937a 100644
--- a/Geo/GPoint.h
+++ b/Geo/GPoint.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GPOINT_H_
 #define _GPOINT_H_
diff --git a/Geo/GRbf.cpp b/Geo/GRbf.cpp
index 35587598df..e35d7c05ac 100644
--- a/Geo/GRbf.cpp
+++ b/Geo/GRbf.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Cecile Piret
 
diff --git a/Geo/GRbf.h b/Geo/GRbf.h
index 25a2bbf5e8..91d3b72ef7 100644
--- a/Geo/GRbf.h
+++ b/Geo/GRbf.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by FIXME
 
diff --git a/Geo/GRegion.cpp b/Geo/GRegion.cpp
index ac20388adf..1c60c95f92 100644
--- a/Geo/GRegion.cpp
+++ b/Geo/GRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include "GModel.h"
diff --git a/Geo/GRegion.h b/Geo/GRegion.h
index 0873819dcc..67d69e4db7 100644
--- a/Geo/GRegion.h
+++ b/Geo/GRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GREGION_H_
 #define _GREGION_H_
diff --git a/Geo/GRegionCompound.cpp b/Geo/GRegionCompound.cpp
index 9f2cc2f90a..4e94616e29 100644
--- a/Geo/GRegionCompound.cpp
+++ b/Geo/GRegionCompound.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Geo/GRegionCompound.h b/Geo/GRegionCompound.h
index 5fc42ce96e..793004d60e 100644
--- a/Geo/GRegionCompound.h
+++ b/Geo/GRegionCompound.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GREGION_COMPOUND_H_
 #define _GREGION_COMPOUND_H_
diff --git a/Geo/GVertex.cpp b/Geo/GVertex.cpp
index fb265219da..62b9696143 100644
--- a/Geo/GVertex.cpp
+++ b/Geo/GVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <algorithm>
diff --git a/Geo/GVertex.h b/Geo/GVertex.h
index 47e30cb8d8..aec7ed0cb2 100644
--- a/Geo/GVertex.h
+++ b/Geo/GVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GVERTEX_H_
 #define _GVERTEX_H_
diff --git a/Geo/GenericEdge.cpp b/Geo/GenericEdge.cpp
index c40ee9b2a6..76f82dfcff 100644
--- a/Geo/GenericEdge.cpp
+++ b/Geo/GenericEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericEdge.h b/Geo/GenericEdge.h
index 0b550b1481..8c8e5019c3 100644
--- a/Geo/GenericEdge.h
+++ b/Geo/GenericEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericFace.cpp b/Geo/GenericFace.cpp
index 7efbb5fd37..2cfe27cb0e 100644
--- a/Geo/GenericFace.cpp
+++ b/Geo/GenericFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericFace.h b/Geo/GenericFace.h
index 961a921f7d..12050a98f8 100644
--- a/Geo/GenericFace.h
+++ b/Geo/GenericFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericRegion.cpp b/Geo/GenericRegion.cpp
index 092e7aa7e2..09f49024b6 100644
--- a/Geo/GenericRegion.cpp
+++ b/Geo/GenericRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericRegion.h b/Geo/GenericRegion.h
index 312854781e..399da8738e 100644
--- a/Geo/GenericRegion.h
+++ b/Geo/GenericRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericVertex.cpp b/Geo/GenericVertex.cpp
index 3081089aa6..f95311fc14 100644
--- a/Geo/GenericVertex.cpp
+++ b/Geo/GenericVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/GenericVertex.h b/Geo/GenericVertex.h
index 2bdcb0b0ad..f584ba5fd7 100644
--- a/Geo/GenericVertex.h
+++ b/Geo/GenericVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index d85971dc09..ff97645d51 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/Geo/Geo.h b/Geo/Geo.h
index cb5688b38d..97367b003d 100644
--- a/Geo/Geo.h
+++ b/Geo/Geo.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEO_H_
 #define _GEO_H_
diff --git a/Geo/GeoInterpolation.cpp b/Geo/GeoInterpolation.cpp
index 28806670d8..edd0553a28 100644
--- a/Geo/GeoInterpolation.cpp
+++ b/Geo/GeoInterpolation.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "Geo.h"
diff --git a/Geo/GeoInterpolation.h b/Geo/GeoInterpolation.h
index 68bd608e06..a8bbcc9293 100644
--- a/Geo/GeoInterpolation.h
+++ b/Geo/GeoInterpolation.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEO_INTERPOLATION_H_
 #define _GEO_INTERPOLATION_H_
diff --git a/Geo/GeoStringInterface.cpp b/Geo/GeoStringInterface.cpp
index 7deff19403..ad9529c41c 100644
--- a/Geo/GeoStringInterface.cpp
+++ b/Geo/GeoStringInterface.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <sstream>
diff --git a/Geo/GeoStringInterface.h b/Geo/GeoStringInterface.h
index 50475186c5..41256dcfe5 100644
--- a/Geo/GeoStringInterface.h
+++ b/Geo/GeoStringInterface.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GEO_STRING_INTERFACE_H_
 #define _GEO_STRING_INTERFACE_H_
diff --git a/Geo/GeomMeshMatcher.cpp b/Geo/GeomMeshMatcher.cpp
index 90afa4ab03..4c47805362 100644
--- a/Geo/GeomMeshMatcher.cpp
+++ b/Geo/GeomMeshMatcher.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Bastien Gorissen
diff --git a/Geo/GeomMeshMatcher.h b/Geo/GeomMeshMatcher.h
index e53420c1ea..ed8b2d39ff 100644
--- a/Geo/GeomMeshMatcher.h
+++ b/Geo/GeomMeshMatcher.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Bastien Gorissen
diff --git a/Geo/Homology.cpp b/Geo/Homology.cpp
index 7a2a0bceb5..50500eb93c 100644
--- a/Geo/Homology.cpp
+++ b/Geo/Homology.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/Homology.h b/Geo/Homology.h
index 5f1d78590f..5649927a1c 100644
--- a/Geo/Homology.h
+++ b/Geo/Homology.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Geo/MEdge.cpp b/Geo/MEdge.cpp
index 78c9d6f69a..3d57fdfa5f 100644
--- a/Geo/MEdge.cpp
+++ b/Geo/MEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "MEdge.h"
diff --git a/Geo/MEdge.h b/Geo/MEdge.h
index 0e29c042df..d398080964 100644
--- a/Geo/MEdge.h
+++ b/Geo/MEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MEDGE_H_
 #define _MEDGE_H_
diff --git a/Geo/MEdgeHash.h b/Geo/MEdgeHash.h
index d9d20a4030..eb61623707 100644
--- a/Geo/MEdgeHash.h
+++ b/Geo/MEdgeHash.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MEDGE_HASH_H_
 #define _MEDGE_HASH_H_
diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp
index f8501ef1f0..4858e5f8f3 100644
--- a/Geo/MElement.cpp
+++ b/Geo/MElement.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <math.h>
diff --git a/Geo/MElement.h b/Geo/MElement.h
index 0d43eed4df..fda1ade945 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MELEMENT_H_
 #define _MELEMENT_H_
diff --git a/Geo/MElementCut.cpp b/Geo/MElementCut.cpp
index bdd317f83c..47a57c2ddb 100644
--- a/Geo/MElementCut.cpp
+++ b/Geo/MElementCut.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Gaetan Bricteux
diff --git a/Geo/MElementCut.h b/Geo/MElementCut.h
index 9b21d213b1..0d95408201 100644
--- a/Geo/MElementCut.h
+++ b/Geo/MElementCut.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Gaetan Bricteux
diff --git a/Geo/MElementOctree.cpp b/Geo/MElementOctree.cpp
index a63e5889be..0b1da70271 100644
--- a/Geo/MElementOctree.cpp
+++ b/Geo/MElementOctree.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "MElement.h"
diff --git a/Geo/MElementOctree.h b/Geo/MElementOctree.h
index 4226809a0d..1fbe12f7e2 100644
--- a/Geo/MElementOctree.h
+++ b/Geo/MElementOctree.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MELEMENT_OCTREE_
 #define _MELEMENT_OCTREE_
diff --git a/Geo/MFace.cpp b/Geo/MFace.cpp
index d9dd53cb81..526a5c4df3 100644
--- a/Geo/MFace.cpp
+++ b/Geo/MFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include <algorithm>
diff --git a/Geo/MFace.h b/Geo/MFace.h
index ecdcd0307a..04e41563a7 100644
--- a/Geo/MFace.h
+++ b/Geo/MFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MFACE_H_
 #define _MFACE_H_
diff --git a/Geo/MFaceHash.h b/Geo/MFaceHash.h
index 85fe828a65..eb140641a5 100644
--- a/Geo/MFaceHash.h
+++ b/Geo/MFaceHash.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MFACE_HASH_H_
 #define _MFACE_HASH_H_
diff --git a/Geo/MHexahedron.cpp b/Geo/MHexahedron.cpp
index 04b881e825..ccc3796e99 100644
--- a/Geo/MHexahedron.cpp
+++ b/Geo/MHexahedron.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 #include <limits>
 #include "MHexahedron.h"
 #include "Numeric.h"
diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h
index fd439ec002..3dda376cad 100644
--- a/Geo/MHexahedron.h
+++ b/Geo/MHexahedron.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MHEXAHEDRON_H_
 #define _MHEXAHEDRON_H_
diff --git a/Geo/MLine.cpp b/Geo/MLine.cpp
index e7c506581d..ae11a44283 100644
--- a/Geo/MLine.cpp
+++ b/Geo/MLine.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshDefines.h"
 #include "MLine.h"
diff --git a/Geo/MLine.h b/Geo/MLine.h
index eb78a13eb5..79d4b5d29d 100644
--- a/Geo/MLine.h
+++ b/Geo/MLine.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MLINE_H_
 #define _MLINE_H_
diff --git a/Geo/MPoint.h b/Geo/MPoint.h
index 40991dea98..4e95a2d9af 100644
--- a/Geo/MPoint.h
+++ b/Geo/MPoint.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MPOINT_H_
 #define _MPOINT_H_
diff --git a/Geo/MPrism.cpp b/Geo/MPrism.cpp
index 6a8d1307b0..3ac5ae27e5 100644
--- a/Geo/MPrism.cpp
+++ b/Geo/MPrism.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MPrism.h"
 #include "Numeric.h"
diff --git a/Geo/MPrism.h b/Geo/MPrism.h
index 3cbd0a19b9..844d147176 100644
--- a/Geo/MPrism.h
+++ b/Geo/MPrism.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MPRISM_H_
 #define _MPRISM_H_
diff --git a/Geo/MPyramid.cpp b/Geo/MPyramid.cpp
index 2c6570bef0..ea27a2a795 100644
--- a/Geo/MPyramid.cpp
+++ b/Geo/MPyramid.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MPyramid.h"
 #include "Numeric.h"
diff --git a/Geo/MPyramid.h b/Geo/MPyramid.h
index 261b61023c..85a676b4b7 100644
--- a/Geo/MPyramid.h
+++ b/Geo/MPyramid.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MPYRAMID_H_
 #define _MPYRAMID_H_
diff --git a/Geo/MQuadrangle.cpp b/Geo/MQuadrangle.cpp
index 37b55e4ef4..468fd5306d 100644
--- a/Geo/MQuadrangle.cpp
+++ b/Geo/MQuadrangle.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "MQuadrangle.h"
diff --git a/Geo/MQuadrangle.h b/Geo/MQuadrangle.h
index 7b84e42bbb..252507b485 100644
--- a/Geo/MQuadrangle.h
+++ b/Geo/MQuadrangle.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MQUADRANGLE_H_
 #define _MQUADRANGLE_H_
diff --git a/Geo/MSubElement.cpp b/Geo/MSubElement.cpp
index 02b3d91cee..737251e371 100644
--- a/Geo/MSubElement.cpp
+++ b/Geo/MSubElement.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Frederic Duboeuf
diff --git a/Geo/MSubElement.h b/Geo/MSubElement.h
index d161fd9e9c..f54dae3f37 100644
--- a/Geo/MSubElement.h
+++ b/Geo/MSubElement.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Frederic Duboeuf
diff --git a/Geo/MTetrahedron.cpp b/Geo/MTetrahedron.cpp
index ee068aba04..9bda9f6b5d 100644
--- a/Geo/MTetrahedron.cpp
+++ b/Geo/MTetrahedron.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "MTetrahedron.h"
diff --git a/Geo/MTetrahedron.h b/Geo/MTetrahedron.h
index 0cc9a5e5c5..d9ce0ada05 100644
--- a/Geo/MTetrahedron.h
+++ b/Geo/MTetrahedron.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MTETRAHEDRON_H_
 #define _MTETRAHEDRON_H_
diff --git a/Geo/MTriangle.cpp b/Geo/MTriangle.cpp
index d00557a77d..90ebc5d228 100644
--- a/Geo/MTriangle.cpp
+++ b/Geo/MTriangle.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "MTriangle.h"
diff --git a/Geo/MTriangle.h b/Geo/MTriangle.h
index 74bde4741a..3bafc78c3a 100644
--- a/Geo/MTriangle.h
+++ b/Geo/MTriangle.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MTRIANGLE_H_
 #define _MTRIANGLE_H_
diff --git a/Geo/MVertex.cpp b/Geo/MVertex.cpp
index cf49417790..cc64b66fd3 100644
--- a/Geo/MVertex.cpp
+++ b/Geo/MVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <math.h>
diff --git a/Geo/MVertex.h b/Geo/MVertex.h
index c1bc009d03..8445ff5481 100644
--- a/Geo/MVertex.h
+++ b/Geo/MVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MVERTEX_H_
 #define _MVERTEX_H_
diff --git a/Geo/MVertexBoundaryLayerData.cpp b/Geo/MVertexBoundaryLayerData.cpp
index db5c6bd66f..ff68793bf6 100644
--- a/Geo/MVertexBoundaryLayerData.cpp
+++ b/Geo/MVertexBoundaryLayerData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MVertexBoundaryLayerData.h"
 
diff --git a/Geo/MVertexBoundaryLayerData.h b/Geo/MVertexBoundaryLayerData.h
index 9a8461a2e9..2857d50150 100644
--- a/Geo/MVertexBoundaryLayerData.h
+++ b/Geo/MVertexBoundaryLayerData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MVERTEXBOUNDARYLAYERDATA_H_
 #define _MVERTEXBOUNDARYLAYERDATA_H_
diff --git a/Geo/MVertexRTree.h b/Geo/MVertexRTree.h
index 1074343767..166eef90cb 100644
--- a/Geo/MVertexRTree.h
+++ b/Geo/MVertexRTree.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MVERTEX_RTREE_
 #define _MVERTEX_RTREE_
diff --git a/Geo/MZone.cpp b/Geo/MZone.cpp
index 480d425306..d89b3a9ae2 100644
--- a/Geo/MZone.cpp
+++ b/Geo/MZone.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // MZone.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/MZone.h b/Geo/MZone.h
index 167cedcda9..5fa80d28f7 100644
--- a/Geo/MZone.h
+++ b/Geo/MZone.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // MZone.h - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/MZoneBoundary.cpp b/Geo/MZoneBoundary.cpp
index ae4e7c71a6..8899b247aa 100644
--- a/Geo/MZoneBoundary.cpp
+++ b/Geo/MZoneBoundary.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // MZoneBoundary.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/MZoneBoundary.h b/Geo/MZoneBoundary.h
index 67b1a9a2c8..02480ec3da 100644
--- a/Geo/MZoneBoundary.h
+++ b/Geo/MZoneBoundary.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // MZoneBoundary.h - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Geo/OCCEdge.cpp b/Geo/OCCEdge.cpp
index 7b21674b46..85f1baf2a0 100644
--- a/Geo/OCCEdge.cpp
+++ b/Geo/OCCEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <limits>
 #include "GmshConfig.h"
diff --git a/Geo/OCCEdge.h b/Geo/OCCEdge.h
index 5dbd3e6749..9d4fe1182d 100644
--- a/Geo/OCCEdge.h
+++ b/Geo/OCCEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_EDGE_H_
 #define _OCC_EDGE_H_
diff --git a/Geo/OCCFace.cpp b/Geo/OCCFace.cpp
index d8baf1a24f..048f697be6 100644
--- a/Geo/OCCFace.cpp
+++ b/Geo/OCCFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/OCCFace.h b/Geo/OCCFace.h
index 93a96a493c..3f36630e75 100644
--- a/Geo/OCCFace.h
+++ b/Geo/OCCFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_FACE_H_
 #define _OCC_FACE_H_
diff --git a/Geo/OCCIncludes.h b/Geo/OCCIncludes.h
index f300ad9c3f..81114bae6e 100644
--- a/Geo/OCCIncludes.h
+++ b/Geo/OCCIncludes.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_INCLUDES_
 #define _OCC_INCLUDES_
diff --git a/Geo/OCCRegion.cpp b/Geo/OCCRegion.cpp
index efe47a1b9d..b038019dc8 100644
--- a/Geo/OCCRegion.cpp
+++ b/Geo/OCCRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/OCCRegion.h b/Geo/OCCRegion.h
index 29d6e5b9c5..61be8e8a85 100644
--- a/Geo/OCCRegion.h
+++ b/Geo/OCCRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_REGION_H_
 #define _OCC_REGION_H_
diff --git a/Geo/OCCVertex.cpp b/Geo/OCCVertex.cpp
index b882a46020..42e3b8644d 100644
--- a/Geo/OCCVertex.cpp
+++ b/Geo/OCCVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GModel.h"
diff --git a/Geo/OCCVertex.h b/Geo/OCCVertex.h
index bd3ff321fc..8fbba61668 100644
--- a/Geo/OCCVertex.h
+++ b/Geo/OCCVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCC_VERTEX_H_
 #define _OCC_VERTEX_H_
diff --git a/Geo/OCC_Connect.cpp b/Geo/OCC_Connect.cpp
index 6c7720fc37..a1ac9a30c9 100644
--- a/Geo/OCC_Connect.cpp
+++ b/Geo/OCC_Connect.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Mark van Doesburg, Technolution B.V.
 
diff --git a/Geo/OCC_Connect.h b/Geo/OCC_Connect.h
index 9c954f24c3..dfccdd467c 100644
--- a/Geo/OCC_Connect.h
+++ b/Geo/OCC_Connect.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Mark van Doesburg, Technolution B.V.
 
diff --git a/Geo/Pair.h b/Geo/Pair.h
index e45a6d8bb1..cd9ec99618 100644
--- a/Geo/Pair.h
+++ b/Geo/Pair.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PAIR_H_
 #define _PAIR_H_
diff --git a/Geo/Range.h b/Geo/Range.h
index 9920432a79..a4088f442f 100644
--- a/Geo/Range.h
+++ b/Geo/Range.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _RANGE_H_
 #define _RANGE_H_
diff --git a/Geo/SBoundingBox3d.h b/Geo/SBoundingBox3d.h
index b3b40251b4..3565f0c976 100644
--- a/Geo/SBoundingBox3d.h
+++ b/Geo/SBoundingBox3d.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SBOUNDING_BOX_3D_H_
 #define _SBOUNDING_BOX_3D_H_
diff --git a/Geo/SGEOMIncludes.h b/Geo/SGEOMIncludes.h
index adcaf57551..fa13fa2bfb 100644
--- a/Geo/SGEOMIncludes.h
+++ b/Geo/SGEOMIncludes.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SGEOM_INCLUDES_
 #define _SGEOM_INCLUDES_
diff --git a/Geo/SOrientedBoundingBox.cpp b/Geo/SOrientedBoundingBox.cpp
index 95d022d78b..0eb2ccaed6 100644
--- a/Geo/SOrientedBoundingBox.cpp
+++ b/Geo/SOrientedBoundingBox.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Bastien Gorissen
diff --git a/Geo/SOrientedBoundingBox.h b/Geo/SOrientedBoundingBox.h
index 547353a582..dc02c000a2 100644
--- a/Geo/SOrientedBoundingBox.h
+++ b/Geo/SOrientedBoundingBox.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Bastien Gorissen
diff --git a/Geo/SPoint2.h b/Geo/SPoint2.h
index 2588ade1fb..5c4f4d6858 100644
--- a/Geo/SPoint2.h
+++ b/Geo/SPoint2.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPOINT2_H_
 #define _SPOINT2_H_
diff --git a/Geo/SPoint3.h b/Geo/SPoint3.h
index 3545fc8d22..ea44797c98 100644
--- a/Geo/SPoint3.h
+++ b/Geo/SPoint3.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPOINT3_H_
 #define _SPOINT3_H_
diff --git a/Geo/STensor3.cpp b/Geo/STensor3.cpp
index 8d22139ee2..12c242fd0a 100644
--- a/Geo/STensor3.cpp
+++ b/Geo/STensor3.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "STensor3.h"
diff --git a/Geo/STensor3.h b/Geo/STensor3.h
index b3a56a3b06..1a20b273b5 100644
--- a/Geo/STensor3.h
+++ b/Geo/STensor3.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _STENSOR3_H_
 #define _STENSOR3_H_
diff --git a/Geo/SVector3.h b/Geo/SVector3.h
index 7ba4e798a3..96e796a329 100644
--- a/Geo/SVector3.h
+++ b/Geo/SVector3.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SVECTOR3_H_
 #define _SVECTOR3_H_
diff --git a/Geo/boundaryLayersData.cpp b/Geo/boundaryLayersData.cpp
index e7bd3228a9..6886eff5d4 100644
--- a/Geo/boundaryLayersData.cpp
+++ b/Geo/boundaryLayersData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stack>
 #include "GmshConfig.h"
diff --git a/Geo/boundaryLayersData.h b/Geo/boundaryLayersData.h
index 846aca32ba..419dba893a 100644
--- a/Geo/boundaryLayersData.h
+++ b/Geo/boundaryLayersData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BNDRYLRDATA_
 #define _BNDRYLRDATA_
diff --git a/Geo/closestPoint.cpp b/Geo/closestPoint.cpp
index ddee5e1d34..94bd921b18 100644
--- a/Geo/closestPoint.cpp
+++ b/Geo/closestPoint.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "closestPoint.h"
 #include "GEntity.h"
diff --git a/Geo/closestPoint.h b/Geo/closestPoint.h
index 10ac4305d9..4fba49e9ac 100644
--- a/Geo/closestPoint.h
+++ b/Geo/closestPoint.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CLOSEST_POINT_H_
 #define _CLOSEST_POINT_H_
diff --git a/Geo/discreteEdge.cpp b/Geo/discreteEdge.cpp
index 8aa77bfa95..4b5cc2652a 100644
--- a/Geo/discreteEdge.cpp
+++ b/Geo/discreteEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include <list>
diff --git a/Geo/discreteEdge.h b/Geo/discreteEdge.h
index d21d4041cd..0d80563c3a 100644
--- a/Geo/discreteEdge.h
+++ b/Geo/discreteEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_EDGE_H_
 #define _DISCRETE_EDGE_H_
diff --git a/Geo/discreteFace.cpp b/Geo/discreteFace.cpp
index 29df07cbbf..5e4ed1ce14 100644
--- a/Geo/discreteFace.cpp
+++ b/Geo/discreteFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GmshConfig.h"
diff --git a/Geo/discreteFace.h b/Geo/discreteFace.h
index 1368b42654..6a978be2ce 100644
--- a/Geo/discreteFace.h
+++ b/Geo/discreteFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_FACE_H_
 #define _DISCRETE_FACE_H_
diff --git a/Geo/discreteRegion.cpp b/Geo/discreteRegion.cpp
index a67577fbf9..5a27ec5827 100644
--- a/Geo/discreteRegion.cpp
+++ b/Geo/discreteRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "discreteRegion.h"
diff --git a/Geo/discreteRegion.h b/Geo/discreteRegion.h
index 60f1f0ca77..7d8c58bbae 100644
--- a/Geo/discreteRegion.h
+++ b/Geo/discreteRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_REGION_H_
 #define _DISCRETE_REGION_H_
diff --git a/Geo/discreteVertex.h b/Geo/discreteVertex.h
index 7087a14418..cd33b4fc46 100644
--- a/Geo/discreteVertex.h
+++ b/Geo/discreteVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_VERTEX_H_
 #define _DISCRETE_VERTEX_H_
diff --git a/Geo/findLinks.cpp b/Geo/findLinks.cpp
index 172e7fd6f5..0f952add86 100644
--- a/Geo/findLinks.cpp
+++ b/Geo/findLinks.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GmshMessage.h"
diff --git a/Geo/findLinks.h b/Geo/findLinks.h
index 37b4587e65..e0d6bafc77 100644
--- a/Geo/findLinks.h
+++ b/Geo/findLinks.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIND_LINKS_H_
 #define _FIND_LINKS_H_
diff --git a/Geo/fourierEdge.cpp b/Geo/fourierEdge.cpp
index 26a919a862..ac2ce7f501 100644
--- a/Geo/fourierEdge.cpp
+++ b/Geo/fourierEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "fourierEdge.h"
diff --git a/Geo/fourierEdge.h b/Geo/fourierEdge.h
index 68ae00f778..73a528e5fd 100644
--- a/Geo/fourierEdge.h
+++ b/Geo/fourierEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FOURIER_EDGE_H_
 #define _FOURIER_EDGE_H_
diff --git a/Geo/fourierFace.cpp b/Geo/fourierFace.cpp
index 98e158ae84..daa4e3657e 100644
--- a/Geo/fourierFace.cpp
+++ b/Geo/fourierFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <list>
 #include "GmshConfig.h"
diff --git a/Geo/fourierFace.h b/Geo/fourierFace.h
index 7e2a93b695..5643a95a39 100644
--- a/Geo/fourierFace.h
+++ b/Geo/fourierFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FOURIER_FACE_H_
 #define _FOURIER_FACE_H_
diff --git a/Geo/fourierProjectionFace.cpp b/Geo/fourierProjectionFace.cpp
index 91daecbf47..7452b0f5d4 100644
--- a/Geo/fourierProjectionFace.cpp
+++ b/Geo/fourierProjectionFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/fourierProjectionFace.h b/Geo/fourierProjectionFace.h
index f127b07893..0a11a207ee 100644
--- a/Geo/fourierProjectionFace.h
+++ b/Geo/fourierProjectionFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FOURIER_PROJECTION_FACE_H_
 #define _FOURIER_PROJECTION_FACE_H_
diff --git a/Geo/fourierVertex.h b/Geo/fourierVertex.h
index f0fcb0d0ae..33466fc8e0 100644
--- a/Geo/fourierVertex.h
+++ b/Geo/fourierVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FOURIER_VERTEX_H_
 #define _FOURIER_VERTEX_H_
diff --git a/Geo/gmshEdge.cpp b/Geo/gmshEdge.cpp
index ff1fa465d9..3e3263e7bc 100644
--- a/Geo/gmshEdge.cpp
+++ b/Geo/gmshEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include "GModel.h"
diff --git a/Geo/gmshEdge.h b/Geo/gmshEdge.h
index 09b94106e6..89b9be5d01 100644
--- a/Geo/gmshEdge.h
+++ b/Geo/gmshEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_EDGE_H_
 #define _GMSH_EDGE_H_
diff --git a/Geo/gmshEdgeDiscretize.cpp b/Geo/gmshEdgeDiscretize.cpp
index 7fc51e59ec..20e13333f6 100644
--- a/Geo/gmshEdgeDiscretize.cpp
+++ b/Geo/gmshEdgeDiscretize.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <cstdio>
 #include <cmath>
diff --git a/Geo/gmshFace.cpp b/Geo/gmshFace.cpp
index b960952a18..38f6e58345 100644
--- a/Geo/gmshFace.cpp
+++ b/Geo/gmshFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GModel.h"
diff --git a/Geo/gmshFace.h b/Geo/gmshFace.h
index 71da5e5a18..faf9397dc7 100644
--- a/Geo/gmshFace.h
+++ b/Geo/gmshFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_FACE_H_
 #define _GMSH_FACE_H_
diff --git a/Geo/gmshLevelset.cpp b/Geo/gmshLevelset.cpp
index e28ebeceaa..5fb9ae71e5 100644
--- a/Geo/gmshLevelset.cpp
+++ b/Geo/gmshLevelset.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Gaetan Bricteux
diff --git a/Geo/gmshLevelset.h b/Geo/gmshLevelset.h
index ff8889b10e..257c00ab8c 100644
--- a/Geo/gmshLevelset.h
+++ b/Geo/gmshLevelset.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Gaetan Bricteux
diff --git a/Geo/gmshRegion.cpp b/Geo/gmshRegion.cpp
index fd2dfb846e..7c31177df4 100644
--- a/Geo/gmshRegion.cpp
+++ b/Geo/gmshRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GModel.h"
diff --git a/Geo/gmshRegion.h b/Geo/gmshRegion.h
index 6dea600f50..c09adc6a14 100644
--- a/Geo/gmshRegion.h
+++ b/Geo/gmshRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_REGION_H_
 #define _GMSH_REGION_H_
diff --git a/Geo/gmshSurface.cpp b/Geo/gmshSurface.cpp
index f5893b6671..851c1ff270 100644
--- a/Geo/gmshSurface.cpp
+++ b/Geo/gmshSurface.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Geo/gmshSurface.h b/Geo/gmshSurface.h
index b7b1040986..c5708a7641 100644
--- a/Geo/gmshSurface.h
+++ b/Geo/gmshSurface.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_SURFACE_H_
 #define _GMSH_SURFACE_H_
diff --git a/Geo/gmshVertex.cpp b/Geo/gmshVertex.cpp
index 686017a444..4384512511 100644
--- a/Geo/gmshVertex.cpp
+++ b/Geo/gmshVertex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GFace.h"
 #include "GEdge.h"
diff --git a/Geo/gmshVertex.h b/Geo/gmshVertex.h
index 72725b8cde..75e11a5d1c 100644
--- a/Geo/gmshVertex.h
+++ b/Geo/gmshVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GMSH_VERTEX_H_
 #define _GMSH_VERTEX_H_
diff --git a/Geo/intersectCurveSurface.cpp b/Geo/intersectCurveSurface.cpp
index eebbece38f..6e86a45bb9 100644
--- a/Geo/intersectCurveSurface.cpp
+++ b/Geo/intersectCurveSurface.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "intersectCurveSurface.h"
 #include "Numeric.h"
diff --git a/Geo/intersectCurveSurface.h b/Geo/intersectCurveSurface.h
index 2edc08d1cd..a4e8dbcca6 100644
--- a/Geo/intersectCurveSurface.h
+++ b/Geo/intersectCurveSurface.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INTERSECT_CURVE_SURFACE_
 #define _INTERSECT_CURVE_SURFACE_
diff --git a/Geo/partitionEdge.h b/Geo/partitionEdge.h
index c68ee5b554..cbabfaf1b4 100644
--- a/Geo/partitionEdge.h
+++ b/Geo/partitionEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTITION_EDGE_H_
 #define _PARTITION_EDGE_H_
diff --git a/Geo/partitionFace.h b/Geo/partitionFace.h
index 2fdbe1eb07..87b6d66e78 100644
--- a/Geo/partitionFace.h
+++ b/Geo/partitionFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTITION_FACE_H_
 #define _PARTITION_FACE_H_
diff --git a/Geo/partitionVertex.h b/Geo/partitionVertex.h
index 8bb9e3a168..0fa6f291dd 100644
--- a/Geo/partitionVertex.h
+++ b/Geo/partitionVertex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTITION_VERTEX_H_
 #define _PARTITION_VERTEX_H_
diff --git a/Graphics/CMakeLists.txt b/Graphics/CMakeLists.txt
index 667343da0a..be25be1872 100644
--- a/Graphics/CMakeLists.txt
+++ b/Graphics/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Camera.cpp 
diff --git a/Graphics/Camera.cpp b/Graphics/Camera.cpp
index 1c6c80d540..a5a82ac4e0 100644
--- a/Graphics/Camera.cpp
+++ b/Graphics/Camera.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 
diff --git a/Graphics/Camera.h b/Graphics/Camera.h
index 6f64b87b3b..c35b004eb6 100644
--- a/Graphics/Camera.h
+++ b/Graphics/Camera.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Gilles Marckmann <gilles.marckmann@ec-nantes.fr>
 
diff --git a/Graphics/PixelBuffer.h b/Graphics/PixelBuffer.h
index 227f54d6c4..90c179bcee 100644
--- a/Graphics/PixelBuffer.h
+++ b/Graphics/PixelBuffer.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PIXEL_BUFFER_H_
 #define _PIXEL_BUFFER_H_
diff --git a/Graphics/ReadImg.cpp b/Graphics/ReadImg.cpp
index 7cdc3bc15b..731875a514 100644
--- a/Graphics/ReadImg.cpp
+++ b/Graphics/ReadImg.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "ReadImg.h"
diff --git a/Graphics/ReadImg.h b/Graphics/ReadImg.h
index 6b2c93bf10..37f17d2143 100644
--- a/Graphics/ReadImg.h
+++ b/Graphics/ReadImg.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _READ_IMG_
 #define _READ_IMG_
diff --git a/Graphics/drawAxes.cpp b/Graphics/drawAxes.cpp
index 4e42623c16..ccbad7ba21 100644
--- a/Graphics/drawAxes.cpp
+++ b/Graphics/drawAxes.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <iostream>
diff --git a/Graphics/drawContext.cpp b/Graphics/drawContext.cpp
index 02ff5dfe06..b8b051a476 100644
--- a/Graphics/drawContext.cpp
+++ b/Graphics/drawContext.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 #include <stdio.h>
diff --git a/Graphics/drawContext.h b/Graphics/drawContext.h
index 870e2d7282..35ca6cde7e 100644
--- a/Graphics/drawContext.h
+++ b/Graphics/drawContext.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DRAW_CONTEXT_H_
 #define _DRAW_CONTEXT_H_
diff --git a/Graphics/drawGeom.cpp b/Graphics/drawGeom.cpp
index d99b2addb4..dc5081a027 100644
--- a/Graphics/drawGeom.cpp
+++ b/Graphics/drawGeom.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "drawContext.h"
diff --git a/Graphics/drawGlyph.cpp b/Graphics/drawGlyph.cpp
index c2cc4f769f..a748158b29 100644
--- a/Graphics/drawGlyph.cpp
+++ b/Graphics/drawGlyph.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "drawContext.h"
diff --git a/Graphics/drawGraph2d.cpp b/Graphics/drawGraph2d.cpp
index 181d344dd9..d6ebb60551 100644
--- a/Graphics/drawGraph2d.cpp
+++ b/Graphics/drawGraph2d.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "drawContext.h"
diff --git a/Graphics/drawMesh.cpp b/Graphics/drawMesh.cpp
index f0d9dfe1cf..7544c357bd 100644
--- a/Graphics/drawMesh.cpp
+++ b/Graphics/drawMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "drawContext.h"
diff --git a/Graphics/drawPost.cpp b/Graphics/drawPost.cpp
index 6528e1676d..1a27bb913d 100644
--- a/Graphics/drawPost.cpp
+++ b/Graphics/drawPost.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include <algorithm>
diff --git a/Graphics/drawScales.cpp b/Graphics/drawScales.cpp
index 0b40e2d7ab..4bad743d2c 100644
--- a/Graphics/drawScales.cpp
+++ b/Graphics/drawScales.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "drawContext.h"
diff --git a/Graphics/gl2gif.cpp b/Graphics/gl2gif.cpp
index f6bb1ae015..273f64df12 100644
--- a/Graphics/gl2gif.cpp
+++ b/Graphics/gl2gif.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 /*
  * Warning: This code is really a dirty hack. It SHOULD be cleaned
diff --git a/Graphics/gl2gif.h b/Graphics/gl2gif.h
index aed558124c..e26b239191 100644
--- a/Graphics/gl2gif.h
+++ b/Graphics/gl2gif.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2GIF_H_
 #define _GL2GIF_H_
diff --git a/Graphics/gl2jpeg.cpp b/Graphics/gl2jpeg.cpp
index 37a80b7d2d..eb7c5aa63a 100644
--- a/Graphics/gl2jpeg.cpp
+++ b/Graphics/gl2jpeg.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "gl2jpeg.h"
diff --git a/Graphics/gl2jpeg.h b/Graphics/gl2jpeg.h
index a25df0704c..2f64b99cc8 100644
--- a/Graphics/gl2jpeg.h
+++ b/Graphics/gl2jpeg.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2JPEG_H_
 #define _GL2JPEG_H_
diff --git a/Graphics/gl2pgf.cpp b/Graphics/gl2pgf.cpp
index 0e04cc397a..500efe89a4 100644
--- a/Graphics/gl2pgf.cpp
+++ b/Graphics/gl2pgf.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Sebastian Eiser
 
diff --git a/Graphics/gl2pgf.h b/Graphics/gl2pgf.h
index 830a16d2f2..586cd69886 100644
--- a/Graphics/gl2pgf.h
+++ b/Graphics/gl2pgf.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2PGF_H_
 #define _GL2PGF_H_
diff --git a/Graphics/gl2png.cpp b/Graphics/gl2png.cpp
index 4916beb114..2a7ce0e132 100644
--- a/Graphics/gl2png.cpp
+++ b/Graphics/gl2png.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "gl2png.h"
diff --git a/Graphics/gl2png.h b/Graphics/gl2png.h
index 8bb96d5f26..b1ba0d15f5 100644
--- a/Graphics/gl2png.h
+++ b/Graphics/gl2png.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2PNG_H_
 #define _GL2PNG_H_
diff --git a/Graphics/gl2ppm.cpp b/Graphics/gl2ppm.cpp
index 08c998bd62..18b5e3e89a 100644
--- a/Graphics/gl2ppm.cpp
+++ b/Graphics/gl2ppm.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "gl2ppm.h"
 
diff --git a/Graphics/gl2ppm.h b/Graphics/gl2ppm.h
index 1c71a523b6..82d438eeed 100644
--- a/Graphics/gl2ppm.h
+++ b/Graphics/gl2ppm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2PPM_H_
 #define _GL2PPM_H_
diff --git a/Graphics/gl2yuv.cpp b/Graphics/gl2yuv.cpp
index 8e3febbb8a..dc5a063757 100644
--- a/Graphics/gl2yuv.cpp
+++ b/Graphics/gl2yuv.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 /*
  * This code is based on the rgbtoycc.c code from the MPEG-1 Video
diff --git a/Graphics/gl2yuv.h b/Graphics/gl2yuv.h
index ee82f83a09..06c38d4b7e 100644
--- a/Graphics/gl2yuv.h
+++ b/Graphics/gl2yuv.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GL2YUV_H_
 #define _GL2YUV_H_
diff --git a/Mesh/BDS.cpp b/Mesh/BDS.cpp
index 8df3a4a002..11a23f5a10 100644
--- a/Mesh/BDS.cpp
+++ b/Mesh/BDS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stack>
 #include <math.h>
diff --git a/Mesh/BDS.h b/Mesh/BDS.h
index 1a8bf53c06..b7b1b80df3 100644
--- a/Mesh/BDS.h
+++ b/Mesh/BDS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BDS_H_
 #define _BDS_H_
diff --git a/Mesh/BGMBase.cpp b/Mesh/BGMBase.cpp
index 35ba60d647..fe7af255a5 100644
--- a/Mesh/BGMBase.cpp
+++ b/Mesh/BGMBase.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BGMBase.h"
 
diff --git a/Mesh/BGMBase.h b/Mesh/BGMBase.h
index 5cf5deadbb..6a66b23ca6 100644
--- a/Mesh/BGMBase.h
+++ b/Mesh/BGMBase.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH_BASE_H_
 #define _BACKGROUND_MESH_BASE_H_
diff --git a/Mesh/BackgroundMesh.cpp b/Mesh/BackgroundMesh.cpp
index 0cd8f8b5a0..3f3f359396 100644
--- a/Mesh/BackgroundMesh.cpp
+++ b/Mesh/BackgroundMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "BackgroundMesh.h"
diff --git a/Mesh/BackgroundMesh.h b/Mesh/BackgroundMesh.h
index b31618f86d..7ad287d6a8 100644
--- a/Mesh/BackgroundMesh.h
+++ b/Mesh/BackgroundMesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH_H_
 #define _BACKGROUND_MESH_H_
diff --git a/Mesh/BackgroundMesh2D.cpp b/Mesh/BackgroundMesh2D.cpp
index 2e59853a22..014bf4e4d0 100644
--- a/Mesh/BackgroundMesh2D.cpp
+++ b/Mesh/BackgroundMesh2D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BackgroundMesh2D.h"
 #include "BackgroundMeshTools.h"
diff --git a/Mesh/BackgroundMesh2D.h b/Mesh/BackgroundMesh2D.h
index 1ac7554507..f4ed565f17 100644
--- a/Mesh/BackgroundMesh2D.h
+++ b/Mesh/BackgroundMesh2D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH2D_H_
 #define _BACKGROUND_MESH2D_H_
diff --git a/Mesh/BackgroundMesh3D.cpp b/Mesh/BackgroundMesh3D.cpp
index b92b63ddce..1cd67591cb 100644
--- a/Mesh/BackgroundMesh3D.cpp
+++ b/Mesh/BackgroundMesh3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <fstream>
 #include <algorithm>
diff --git a/Mesh/BackgroundMesh3D.h b/Mesh/BackgroundMesh3D.h
index 6f2c52619b..2a7282d6d5 100644
--- a/Mesh/BackgroundMesh3D.h
+++ b/Mesh/BackgroundMesh3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH3D_H_
 #define _BACKGROUND_MESH3D_H_
diff --git a/Mesh/BackgroundMeshManager.cpp b/Mesh/BackgroundMeshManager.cpp
index 78f7b25224..59f0a8e916 100644
--- a/Mesh/BackgroundMeshManager.cpp
+++ b/Mesh/BackgroundMeshManager.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BackgroundMeshManager.h"
 #include "BGMBase.h"
diff --git a/Mesh/BackgroundMeshManager.h b/Mesh/BackgroundMeshManager.h
index 40702eb086..f7d6b6c699 100644
--- a/Mesh/BackgroundMeshManager.h
+++ b/Mesh/BackgroundMeshManager.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH_MANAGER_H_
 #define _BACKGROUND_MESH_MANAGER_H_
diff --git a/Mesh/BackgroundMeshTools.cpp b/Mesh/BackgroundMeshTools.cpp
index 726b100b96..fe6a091a6a 100644
--- a/Mesh/BackgroundMeshTools.cpp
+++ b/Mesh/BackgroundMeshTools.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BackgroundMeshTools.h"
 #include "GFace.h"
diff --git a/Mesh/BackgroundMeshTools.h b/Mesh/BackgroundMeshTools.h
index bcb573da1f..9314d46256 100644
--- a/Mesh/BackgroundMeshTools.h
+++ b/Mesh/BackgroundMeshTools.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BACKGROUND_MESH_TOOLS_H_
 #define _BACKGROUND_MESH_TOOLS_H_
diff --git a/Mesh/BoundaryLayers.cpp b/Mesh/BoundaryLayers.cpp
index c205cbb155..e1986c36a0 100644
--- a/Mesh/BoundaryLayers.cpp
+++ b/Mesh/BoundaryLayers.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GModel.h"
 #include "MLine.h"
diff --git a/Mesh/BoundaryLayers.h b/Mesh/BoundaryLayers.h
index aa801d6c4d..56d0584353 100644
--- a/Mesh/BoundaryLayers.h
+++ b/Mesh/BoundaryLayers.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BOUNDARY_LAYERS_H_
 #define _BOUNDARY_LAYERS_H_
diff --git a/Mesh/CMakeLists.txt b/Mesh/CMakeLists.txt
index 8465a887ae..aba1b46fb2 100644
--- a/Mesh/CMakeLists.txt
+++ b/Mesh/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
    meshGRegionBoundaryRecovery.cpp
diff --git a/Mesh/CenterlineField.cpp b/Mesh/CenterlineField.cpp
index 62cc1378b1..dafdac3eb9 100644
--- a/Mesh/CenterlineField.cpp
+++ b/Mesh/CenterlineField.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Mesh/CenterlineField.h b/Mesh/CenterlineField.h
index 167bf3caf9..33b2797464 100644
--- a/Mesh/CenterlineField.h
+++ b/Mesh/CenterlineField.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Mesh/DivideAndConquer.cpp b/Mesh/DivideAndConquer.cpp
index e0c69e4c04..bc44779701 100644
--- a/Mesh/DivideAndConquer.cpp
+++ b/Mesh/DivideAndConquer.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // Triangulation using a divide and conquer algorithm
 //
diff --git a/Mesh/DivideAndConquer.h b/Mesh/DivideAndConquer.h
index 6e14346ab0..266e4fb8e8 100644
--- a/Mesh/DivideAndConquer.h
+++ b/Mesh/DivideAndConquer.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DIVIDE_AND_CONQUER_H_
 #define _DIVIDE_AND_CONQUER_H_
diff --git a/Mesh/Field.cpp b/Mesh/Field.cpp
index 772d2371b7..cef89a811a 100644
--- a/Mesh/Field.cpp
+++ b/Mesh/Field.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Jonathan Lambrechts
diff --git a/Mesh/Field.h b/Mesh/Field.h
index af5e364eb0..ee4f902e39 100644
--- a/Mesh/Field.h
+++ b/Mesh/Field.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIELD_H_
 #define _FIELD_H_
diff --git a/Mesh/FieldPython.h b/Mesh/FieldPython.h
index 187f667f02..7ce1f49c40 100644
--- a/Mesh/FieldPython.h
+++ b/Mesh/FieldPython.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIELD_PYTHON_H_
 #define _FIELD_PYTHON_H_
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 6e63f801d4..55adba5952 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <stack>
diff --git a/Mesh/Generator.h b/Mesh/Generator.h
index a32485bdef..d698173f65 100644
--- a/Mesh/Generator.h
+++ b/Mesh/Generator.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GENERATOR_H_
 #define _GENERATOR_H_
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index 08a316f95c..74eefdf12a 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Koen Hillewaert
diff --git a/Mesh/HighOrder.h b/Mesh/HighOrder.h
index d080a75fc1..107f7fa6e7 100644
--- a/Mesh/HighOrder.h
+++ b/Mesh/HighOrder.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HIGH_ORDER_H_
 #define _HIGH_ORDER_H_
diff --git a/Mesh/Levy3D.cpp b/Mesh/Levy3D.cpp
index a26ae0ebfa..34a5bb63e2 100644
--- a/Mesh/Levy3D.cpp
+++ b/Mesh/Levy3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/Levy3D.h b/Mesh/Levy3D.h
index 95d951e0ae..0005b232e2 100644
--- a/Mesh/Levy3D.h
+++ b/Mesh/Levy3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/QuadTriExtruded2D.cpp b/Mesh/QuadTriExtruded2D.cpp
index befecbc72b..d662c404d4 100644
--- a/Mesh/QuadTriExtruded2D.cpp
+++ b/Mesh/QuadTriExtruded2D.cpp
@@ -16,11 +16,11 @@ Geuzaine and J.-F. Remacle with the understanding that his contribution shall be
 cited appropriately.
 
 All reused or original Gmsh code is Copyright (C) 1997-2014 C. Geuzaine,
-J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
+J.-F. Remacle Gmsh is available at: www.gmsh.info
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
diff --git a/Mesh/QuadTriExtruded2D.h b/Mesh/QuadTriExtruded2D.h
index 9a6b26fe3e..3fe9e2fe10 100644
--- a/Mesh/QuadTriExtruded2D.h
+++ b/Mesh/QuadTriExtruded2D.h
@@ -20,7 +20,7 @@ J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
diff --git a/Mesh/QuadTriExtruded3D.cpp b/Mesh/QuadTriExtruded3D.cpp
index b81b4b5b49..78a3df53ce 100644
--- a/Mesh/QuadTriExtruded3D.cpp
+++ b/Mesh/QuadTriExtruded3D.cpp
@@ -16,11 +16,11 @@ Geuzaine and J.-F. Remacle with the understanding that his contribution shall be
 cited appropriately.
 
 All reused or original Gmsh code is Copyright (C) 1997-2014 C. Geuzaine,
-J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
+J.-F. Remacle Gmsh is available at: www.gmsh.info
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
diff --git a/Mesh/QuadTriExtruded3D.h b/Mesh/QuadTriExtruded3D.h
index 6bb19b6cb6..2d71fb3f9d 100644
--- a/Mesh/QuadTriExtruded3D.h
+++ b/Mesh/QuadTriExtruded3D.h
@@ -20,7 +20,7 @@ J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
diff --git a/Mesh/QuadTriTransfinite3D.cpp b/Mesh/QuadTriTransfinite3D.cpp
index 0cef5d09b2..1d194f3946 100644
--- a/Mesh/QuadTriTransfinite3D.cpp
+++ b/Mesh/QuadTriTransfinite3D.cpp
@@ -14,10 +14,10 @@ Christophe Geuzaine and J.-F. Remacle with the understanding that
 his contribution shall be cited appropriately.
 
 All reused or original Gmsh code is Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
-Gmsh is available at: www.geuz.org/gmsh
+Gmsh is available at: www.gmsh.info
 
 For Gmsh license information, see the LICENSE.txt file for license information. Please report all
-Gmsh bugs and problems to the public mailing list <gmsh@geuz.org>.
+Gmsh bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, Version 2,
diff --git a/Mesh/QuadTriTransfinite3D.h b/Mesh/QuadTriTransfinite3D.h
index 92f035a19f..2777c0a5b0 100644
--- a/Mesh/QuadTriTransfinite3D.h
+++ b/Mesh/QuadTriTransfinite3D.h
@@ -17,7 +17,7 @@ All reused or original Gmsh code is Copyright (C) 1997-2016 C. Geuzaine, J.-F. R
 Gmsh is available at: www.geuz.org/gmsh
 
 For Gmsh license information, see the LICENSE.txt file for license information. Please report all
-Gmsh bugs and problems to the public mailing list <gmsh@geuz.org>.
+Gmsh bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, Version 2,
diff --git a/Mesh/QuadTriUtils.cpp b/Mesh/QuadTriUtils.cpp
index 0ddfdd39a3..4e0edb827b 100644
--- a/Mesh/QuadTriUtils.cpp
+++ b/Mesh/QuadTriUtils.cpp
@@ -16,11 +16,11 @@ Geuzaine and J.-F. Remacle with the understanding that his contribution shall be
 cited appropriately.
 
 All reused or original Gmsh code is Copyright (C) 1997-2014 C. Geuzaine,
-J.-F. Remacle Gmsh is available at: www.geuz.org/gmsh
+J.-F. Remacle Gmsh is available at: www.gmsh.info
 
 For Gmsh license information, see the LICENSE.txt file for license
 information. Please report all Gmsh bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, Version 2, as published by the Free
@@ -847,4 +847,3 @@ void fill_touch_bnd( int touch_bnd[], std::vector<bool> vert_bnd, int n_lat )
     }
   }
 }
-
diff --git a/Mesh/QuadTriUtils.h b/Mesh/QuadTriUtils.h
index c458410c73..55f3eecde2 100644
--- a/Mesh/QuadTriUtils.h
+++ b/Mesh/QuadTriUtils.h
@@ -17,7 +17,7 @@ All reused or original Gmsh code is Copyright (C) 1997-2016 C. Geuzaine, J.-F. R
 Gmsh is available at: www.geuz.org/gmsh
 
 For Gmsh license information, see the LICENSE.txt file for license information. Please report all
-Gmsh bugs and problems to the public mailing list <gmsh@geuz.org>.
+Gmsh bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, Version 2,
diff --git a/Mesh/ThinLayer.cpp b/Mesh/ThinLayer.cpp
index 8d8df92ffc..b8bdff41bf 100644
--- a/Mesh/ThinLayer.cpp
+++ b/Mesh/ThinLayer.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Author: Nicolas Kowalski
 
diff --git a/Mesh/ThinLayer.h b/Mesh/ThinLayer.h
index 5c6f5647f8..ae3524d497 100644
--- a/Mesh/ThinLayer.h
+++ b/Mesh/ThinLayer.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Author: Nicolas Kowalski
 
diff --git a/Mesh/Voronoi3D.cpp b/Mesh/Voronoi3D.cpp
index 3a65e3540f..202b9a866c 100644
--- a/Mesh/Voronoi3D.cpp
+++ b/Mesh/Voronoi3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/Voronoi3D.h b/Mesh/Voronoi3D.h
index f09cde08b5..ed6b3b5743 100644
--- a/Mesh/Voronoi3D.h
+++ b/Mesh/Voronoi3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/cross3D.h b/Mesh/cross3D.h
index 47be309ca0..b3e2028050 100644
--- a/Mesh/cross3D.h
+++ b/Mesh/cross3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   François Henrotte
diff --git a/Mesh/delaunay3d.cpp b/Mesh/delaunay3d.cpp
index 707ab56e37..cbba094d89 100644
--- a/Mesh/delaunay3d.cpp
+++ b/Mesh/delaunay3d.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifdef _OPENMP
 #include <omp.h>
diff --git a/Mesh/delaunay3d.h b/Mesh/delaunay3d.h
index 4dff95ed9b..6ec913bb31 100644
--- a/Mesh/delaunay3d.h
+++ b/Mesh/delaunay3d.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DELAUNAY3D_H_
 #define _DELAUNAY3D_H_
diff --git a/Mesh/delaunay3d_private.h b/Mesh/delaunay3d_private.h
index 0533a08425..38eb9ebbf6 100644
--- a/Mesh/delaunay3d_private.h
+++ b/Mesh/delaunay3d_private.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DELAUNAY3D_H_
 #define _DELAUNAY3D_H_
diff --git a/Mesh/directions3D.cpp b/Mesh/directions3D.cpp
index c909c6b884..ad92e9d786 100644
--- a/Mesh/directions3D.cpp
+++ b/Mesh/directions3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier François Henrotte
diff --git a/Mesh/directions3D.h b/Mesh/directions3D.h
index 80c15bce28..e8d4e56969 100644
--- a/Mesh/directions3D.h
+++ b/Mesh/directions3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier François Henrotte
diff --git a/Mesh/filterElements.cpp b/Mesh/filterElements.cpp
index 9dd565e4e3..380838fcad 100644
--- a/Mesh/filterElements.cpp
+++ b/Mesh/filterElements.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include <vector>
diff --git a/Mesh/filterElements.h b/Mesh/filterElements.h
index 8a08b55451..60f16ff06a 100644
--- a/Mesh/filterElements.h
+++ b/Mesh/filterElements.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FILTER_OVERLAPPING_ELEMENTS_
 #define _FILTER_OVERLAPPING_ELEMENTS_
diff --git a/Mesh/meshGEdge.cpp b/Mesh/meshGEdge.cpp
index 56c6b718e5..91bc4bf2a1 100644
--- a/Mesh/meshGEdge.cpp
+++ b/Mesh/meshGEdge.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GModel.h"
diff --git a/Mesh/meshGEdge.h b/Mesh/meshGEdge.h
index f6bb3744aa..7f06a44808 100644
--- a/Mesh/meshGEdge.h
+++ b/Mesh/meshGEdge.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GEDGE_H_
 #define _MESH_GEDGE_H_
diff --git a/Mesh/meshGEdgeExtruded.cpp b/Mesh/meshGEdgeExtruded.cpp
index 13f180edee..53fd1ffc86 100644
--- a/Mesh/meshGEdgeExtruded.cpp
+++ b/Mesh/meshGEdgeExtruded.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "GModel.h"
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 650be44f5c..a6c45fe18f 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <stdlib.h>
diff --git a/Mesh/meshGFace.h b/Mesh/meshGFace.h
index 716251db33..ea9baac2b9 100644
--- a/Mesh/meshGFace.h
+++ b/Mesh/meshGFace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_H_
 #define _MESH_GFACE_H_
diff --git a/Mesh/meshGFaceBDS.cpp b/Mesh/meshGFaceBDS.cpp
index 85fd5f0a14..9af2233c1f 100644
--- a/Mesh/meshGFaceBDS.cpp
+++ b/Mesh/meshGFaceBDS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "GmshMessage.h"
diff --git a/Mesh/meshGFaceBDS.h b/Mesh/meshGFaceBDS.h
index 2833cd36f9..f8a576948a 100644
--- a/Mesh/meshGFaceBDS.h
+++ b/Mesh/meshGFaceBDS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_BDS_H_
 #define _MESH_GFACE_BDS_H_
diff --git a/Mesh/meshGFaceBamg.cpp b/Mesh/meshGFaceBamg.cpp
index 81ea0e6bb9..644fb882bd 100644
--- a/Mesh/meshGFaceBamg.cpp
+++ b/Mesh/meshGFaceBamg.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <iostream>
 #include "meshGFaceBamg.h"
diff --git a/Mesh/meshGFaceBamg.h b/Mesh/meshGFaceBamg.h
index 84b53d20b4..95b99b168c 100644
--- a/Mesh/meshGFaceBamg.h
+++ b/Mesh/meshGFaceBamg.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESHGFACE_BAMG_
 #define _MESHGFACE_BAMG_
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index 4b9addfd23..6500ecc58a 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include <map>
diff --git a/Mesh/meshGFaceDelaunayInsertion.h b/Mesh/meshGFaceDelaunayInsertion.h
index ecc5397fa5..1dede74ed4 100644
--- a/Mesh/meshGFaceDelaunayInsertion.h
+++ b/Mesh/meshGFaceDelaunayInsertion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_DELAUNAY_INSERTIONFACE_H_
 #define _MESH_GFACE_DELAUNAY_INSERTIONFACE_H_
diff --git a/Mesh/meshGFaceElliptic.cpp b/Mesh/meshGFaceElliptic.cpp
index f580e7fa12..3589efa5e5 100644
--- a/Mesh/meshGFaceElliptic.cpp
+++ b/Mesh/meshGFaceElliptic.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stack>
 #include "GmshConfig.h"
diff --git a/Mesh/meshGFaceElliptic.h b/Mesh/meshGFaceElliptic.h
index 2b48e5d895..a6fc2165a0 100644
--- a/Mesh/meshGFaceElliptic.h
+++ b/Mesh/meshGFaceElliptic.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_ELLIPTIC_H_
 #define _MESH_GFACE_ELLIPTIC_H_
diff --git a/Mesh/meshGFaceExtruded.cpp b/Mesh/meshGFaceExtruded.cpp
index f48df1083f..b103706503 100644
--- a/Mesh/meshGFaceExtruded.cpp
+++ b/Mesh/meshGFaceExtruded.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "GModel.h"
diff --git a/Mesh/meshGFaceLloyd.cpp b/Mesh/meshGFaceLloyd.cpp
index 3e8378eba8..7317d42d00 100644
--- a/Mesh/meshGFaceLloyd.cpp
+++ b/Mesh/meshGFaceLloyd.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/meshGFaceLloyd.h b/Mesh/meshGFaceLloyd.h
index 761bff73fd..d7382b6255 100644
--- a/Mesh/meshGFaceLloyd.h
+++ b/Mesh/meshGFaceLloyd.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier
diff --git a/Mesh/meshGFaceOptimize.cpp b/Mesh/meshGFaceOptimize.cpp
index 83e170937d..9cf401938e 100644
--- a/Mesh/meshGFaceOptimize.cpp
+++ b/Mesh/meshGFaceOptimize.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stack>
 #include "GmshConfig.h"
diff --git a/Mesh/meshGFaceOptimize.h b/Mesh/meshGFaceOptimize.h
index 39f82083ba..caf3244ab2 100644
--- a/Mesh/meshGFaceOptimize.h
+++ b/Mesh/meshGFaceOptimize.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_OPTIMIZE_H_
 #define _MESH_GFACE_OPTIMIZE_H_
diff --git a/Mesh/meshGFaceQuadrilateralize.cpp b/Mesh/meshGFaceQuadrilateralize.cpp
index f4ea30dd3f..0dc78d6886 100644
--- a/Mesh/meshGFaceQuadrilateralize.cpp
+++ b/Mesh/meshGFaceQuadrilateralize.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "meshGFaceQuadrilateralize.h"
 #include "GmshMessage.h"
diff --git a/Mesh/meshGFaceQuadrilateralize.h b/Mesh/meshGFaceQuadrilateralize.h
index 76b5065d23..1f60efbe9b 100644
--- a/Mesh/meshGFaceQuadrilateralize.h
+++ b/Mesh/meshGFaceQuadrilateralize.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GFACE_QUADRILATERALIZE_
 #define _MESH_GFACE_QUADRILATERALIZE_
diff --git a/Mesh/meshGFaceRecombine.cpp b/Mesh/meshGFaceRecombine.cpp
index 72078265a9..1b52eb2bb1 100644
--- a/Mesh/meshGFaceRecombine.cpp
+++ b/Mesh/meshGFaceRecombine.cpp
@@ -1,7 +1,7 @@
-// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Amaury Johnen (a.johnen@ulg.ac.be)
@@ -211,7 +211,7 @@ Recombine2D::Recombine2D(GFace *gf, bool col)
     Msg::Error("[Recombine2D] Data instance exists, should not !");
     return;
   }
-  
+
   Recombine2D::_cur = this;
   construct();
 }
@@ -235,21 +235,21 @@ bool Recombine2D::construct()
     Msg::Error("[Recombine2D] Data instance exists, should not !");
     return false;
   }
-  
+
   orientMeshGFace orienter;
   orienter(_gf);
   Rec2DVertex::initStaticTable();
   backgroundMesh::set(_gf); // this doesn't work after call 'recombineWithBlossom()'
   _bgm = backgroundMesh::current();
   _data = new Rec2DData();
-  
+
   static int po = -1;
   if (++po < 1) {
     Msg::Warning("FIXME Why {mesh 2} then {mesh 0} then {mesh 2} imply not corner vertices");
     Msg::Warning("FIXME Why more vertices after first mesh generation");
     Msg::Warning("FIXME Update of Action pointing to edge and vertex (when change)");
   }
-  
+
   // Be able to compute geometrical angle at corners
   std::map<MVertex*, AngleData> mapCornerVert;
   {
@@ -270,7 +270,7 @@ bool Recombine2D::construct()
     // triangles
     for (unsigned int i = 0; i < _gf->triangles.size(); ++i) {
       MTriangle *t = _gf->triangles[i];
-      
+
       Rec2DVertex *rv[3];
       for (int j = 0; j < 3; ++j) {
         MVertex *v = t->getVertex(j);
@@ -293,13 +293,13 @@ bool Recombine2D::construct()
         if ( !(re[j] = Rec2DVertex::getCommonEdge(rv[j], rv[(j+1)%3])) )
           re[j] = new Rec2DEdge(rv[j], rv[(j+1)%3]);
       }
-      
+
       new Rec2DElement(t, re, rv);
     }
     // quadrangles
     for (unsigned int i = 0; i < _gf->quadrangles.size(); ++i) {
       MQuadrangle *q = _gf->quadrangles[i];
-      
+
       Rec2DVertex *rv[4];
       for (int j = 0; j < 4; ++j) {
         MVertex *v = q->getVertex(j);
@@ -322,7 +322,7 @@ bool Recombine2D::construct()
         if ( !(re[j] = Rec2DVertex::getCommonEdge(rv[i], rv[(i+1)%3])) )
           re[j] = new Rec2DEdge(rv[i], rv[(i+1)%3]);
       }
-      
+
       new Rec2DElement(q, re, rv);
     }
   }
@@ -379,10 +379,10 @@ bool Recombine2D::construct()
       }
     }
   }
-  
+
   Rec2DData::checkObsolete();
   _data->printState();
-  
+
   if (_recombineWithBlossom) recombineWithBlossom(_gf, .0, .16, elist, t2n);
   _gf->quadrangles.clear();
   //
@@ -399,8 +399,8 @@ bool Recombine2D::recombine()
     Msg::Error("[Recombine2D] Data instance dosen't exist. Have you called construct() ?");
     return false;
   }
-  
-  I(("Recombining... #actions = %d, horizon = %d", 
+
+  I(("Recombining... #actions = %d, horizon = %d",
             Rec2DData::getNumAction(), _horizon ));
 #ifdef REC2D_DRAW
   __draw(.0);
@@ -409,15 +409,15 @@ bool Recombine2D::recombine()
   _checkIfNotAllQuad = _checkIfNotAllQuad && !_collapses;
   _avoidIfNotAllQuad = _avoidIfNotAllQuad && _checkIfNotAllQuad;
   _revertIfNotAllQuad = _revertIfNotAllQuad && _avoidIfNotAllQuad;
-  
+
   Rec2DNode *root = new Rec2DNode(NULL, NULL, _horizon);
   Rec2DNode *currentNode = Rec2DNode::selectBestNode(root);
-  
+
   while (currentNode) {
     currentNode->lookahead(_horizon);
     currentNode = Rec2DNode::selectBestNode(currentNode);
   }
-  
+
 #ifdef REC2D_DRAW
   __draw(.0);
 #endif
@@ -471,7 +471,7 @@ double Recombine2D::recombine(int depth)
 #endif
   Rec2DNode *root = new Rec2DNode(NULL, NULL, depth);
   Rec2DNode *currentNode = Rec2DNode::selectBestNode(root);
-  
+
   while (currentNode) {
     I(("boucle recombine"));
 #ifdef DRAW_ALL_TIME_STEP
@@ -492,7 +492,7 @@ double Recombine2D::recombine(int depth)
     currentNode->lookahead(depth);
     currentNode = Rec2DNode::selectBestNode(currentNode);
   }
-  
+
   Msg::Info("-------- %g", Rec2DData::getGlobalQuality());
   return Rec2DData::getGlobalQuality();
   //_data->printState();
@@ -508,13 +508,13 @@ void Recombine2D::recombineSameAsBlossom() // check if quality ok
   //recombineWithBlossom(_gf, .0, 1.1, elist, t2n);
   _data->_quad = _gf->quadrangles;
   Recombine2D::drawStateOrigin();
-  
+
   std::map<int, Rec2DElement*> n2rel;
-  std::map<MElement*,int>::iterator it = t2n.begin(); 
+  std::map<MElement*,int>::iterator it = t2n.begin();
   for (; it != t2n.end(); ++it) {
     n2rel[it->second] = Rec2DData::getRElement(it->first);
   }
-  
+
   int blosQual = 0;
   for (int i = 0; i < _cur->elist[0]; ++i) {
     Rec2DElement *tri1 = n2rel[_cur->elist[3*i+1]];
@@ -538,7 +538,7 @@ void Recombine2D::recombineSameAsBlossom() // check if quality ok
     ra->apply(dc, v);
     drawStateOrigin();
   }
-  
+
   Msg::Info("Recombine2D Blossom Quality %d => %d", Rec2DData::getBlosQual(), 100*_cur->elist[0]-Rec2DData::getBlosQual());
   Msg::Info("vs Blossom Blossom Quality %d", blosQual);
   if (blosQual == 100*_cur->elist[0]-Rec2DData::getBlosQual())
@@ -555,13 +555,13 @@ void Recombine2D::recombineSameAsHeuristic()
   _lastRunTime = Cpu() - globtime;
   _data->_quad = _gf->quadrangles;
   drawStateOrigin();
-  
+
   std::map<int, Rec2DElement*> n2rel;
-  std::map<MElement*,int>::iterator it = t2n.begin(); 
+  std::map<MElement*,int>::iterator it = t2n.begin();
   for (; it != t2n.end(); ++it) {
     n2rel[it->second] = Rec2DData::getRElement(it->first);
   }
-  
+
   int heurQual = 0;
   for (int i = 0; i < _cur->elist[0]; ++i) {
     Rec2DElement *tri1 = n2rel[_cur->elist[3*i+1]];
@@ -585,7 +585,7 @@ void Recombine2D::recombineSameAsHeuristic()
     ra->apply(dc, v);
     drawStateOrigin();
   }
-  
+
   _noProblemIfObsolete = false;
   Msg::Info("Recombine2D Blossom Quality %d => %d", Rec2DData::getBlosQual(), 100*_cur->elist[0]-Rec2DData::getBlosQual());
   Msg::Info("vs Heuristic Blossom Quality %d", heurQual);
@@ -614,10 +614,10 @@ void Recombine2D::recombineGreedy(bool constrained)
 //{
 //  Rec2DNode root(NULL, NULL);
 //  _data->printState();
-//  
+//
 //  Msg::Info("best global value : %g", root._getBestSequenceReward());
 //  Msg::Info("num end node : %d", Rec2DData::getNumEndNode());
-//  
+//
 //  Rec2DData::sortEndNode();
 //  Rec2DData::drawEndNode(100);
 //  //_gf->triangles.clear();
@@ -660,7 +660,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
   if (++a == 1) Msg::Warning("FIXME check entities");
   //DEBUG(Rec2DData::checkEntities();)
   actions.clear();
-  
+
   const Rec2DNode *treeNode = node;
   if (Recombine2D::onlyRecombinations() && Recombine2D::priorityOfOneAction()) {
     if (neighbourEl.size()) { // check if there is one in neighbour
@@ -697,7 +697,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
         treeNode = treeNode->getFather();
       }
     }
-    
+
     Rec2DData::getUniqueOneActions(actions); // get all One Action
     if (actions.size()) {
       Rec2DAction *ra = actions[rand() % actions.size()];
@@ -707,8 +707,8 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
       return;
     }
   }
-  
-  
+
+
   std::vector<Rec2DElement*> elements;
   Rec2DAction *ra = NULL;
   Rec2DElement *rel = NULL;
@@ -727,7 +727,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
     case 4 :
       if (!_cur->_curNode->isInSequence()) {
         std::vector<Rec2DElement*> elem;
-        
+
         if (_cur->_curNode->getFather()) {
           _cur->_curNode->getAction()->getNeighbElemWithActions(elem);
           if (elem.size()) {
@@ -735,7 +735,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
             break;
           }
         }
-        
+
         while (_cur->_curNode->notInSubTree()) {
           _cur->_curNode = _cur->_curNode->getSon();
           _cur->_curNode->getAction()->getNeighbElemWithActions(elem);
@@ -747,19 +747,19 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
         if (rel) break;
         // if not, goto case 5 (i.e. try to find in the sequence)
       }
-    
+
     case 6 :
     case 5 :
     {
       while (_cur->_curNode->notInSubTree()) _cur->_curNode = _cur->_curNode->getSon();
       std::vector<Rec2DElement*> elem;
-      
+
       treeNode = _cur->_curNode;
       while (treeNode != node) {
         tmpNode = node;
         while (tmpNode->getFather() != treeNode) tmpNode = tmpNode->getFather();
         treeNode = tmpNode;
-        
+
         treeNode->getAction()->getNeighbElemWithActions(elem);
         if (elem.size()) {
           rel = elem[rand() % (int)elem.size()];
@@ -768,7 +768,7 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
       }
       if (rel) break;
     }
-    
+
     default :
     case 3 : // triangle of best neighbour action
       //I(("3"));
@@ -788,14 +788,14 @@ void Recombine2D::nextTreeActions(std::vector<Rec2DAction*> &actions,
       }
     end :
       if (rel) break;
-      
+
     case 2 : // random neighbour triangle
     //I(("2"));
       if (neighbourEl.size()) {
         rel = neighbourEl[rand() % (int)neighbourEl.size()];
         break;
       }
-      
+
     case 1 : // random triangle of best action
     //I(("1"));
       if (Recombine2D::onlyRecombinations() && _cur->_strategy != 1 && node) {
@@ -835,7 +835,7 @@ end2 :
       rel = ra->getRandomElement();
       break;
   }
-//#ifdef REC2D_DRAW  
+//#ifdef REC2D_DRAW
 //  unsigned int col = CTX::instance()->packColor(90, 128, 85, 255);
 //  rel->getMElement()->setCol(col);
 //#endif
@@ -897,7 +897,7 @@ void Recombine2D::compareWithBlossom()
   Msg::Info("Blossom %d", totalBlossom);
   delete elist;
   t2n.clear();
-  
+
   Rec2DData::clearChanges();
 #ifdef DRAW_WHEN_SELECTED // draw state at origin
     __drawWait(time, REC2D_WAIT_SELECTED);
@@ -1005,10 +1005,10 @@ double Recombine2D::_geomAngle(const MVertex *v,
     return M_PI / 2.;
   }
   static const double prec = 100.;
-  
+
   SVector3 vectv = SVector3(v->x(), v->y(), v->z());
   SVector3 firstDer0, firstDer1;
-  
+
   for (unsigned int k = 0; k < 2; ++k) {
     GEdge *ge = gEdge[k];
     SVector3 vectlb = ge->position(ge->getLowerBound());
@@ -1027,13 +1027,13 @@ double Recombine2D::_geomAngle(const MVertex *v,
     if (k == 0)
       firstDer0 = firstDer1;
   }
-  
+
   firstDer0 = firstDer0 * (1. / norm(firstDer0));
   firstDer1 = firstDer1 * (1. / norm(firstDer1));
-  
+
   double angle1 = acos(dot(firstDer0, firstDer1));
   double angle2 = 2. * M_PI - angle1;
-  
+
   double angleMesh = .0;
   for (unsigned int i = 0; i < elem.size(); ++i) {
     MElement *el = elem[i];
@@ -1048,7 +1048,7 @@ double Recombine2D::_geomAngle(const MVertex *v,
     angleMesh += angle3Vertices(el->getVertex((k+numV-1) % numV), v,
                                 el->getVertex((k+1) % numV)    );
   }
-  
+
   if (angleMesh < M_PI)
     return angle1;
   return angle2;
@@ -1092,17 +1092,17 @@ Rec2DData::~Rec2DData()
 double Rec2DData::getValVert(Rec2DQualCrit crit)
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-  
+
   switch (crit) {
     case BlossomQuality :
       return -1.;
-      
+
     case VertQuality :
       return static_cast<double>(_cur->_1valVert);
-    
+
     case VertEdgeQuality :
       return static_cast<double>(_cur->_2valVert);
-    
+
     default :
       Msg::Error("[Rec2DData:getValVert] Unknown quality criterion");
   }
@@ -1117,7 +1117,7 @@ void Rec2DData::add(const Rec2DEdge *re)
   }
   ((Rec2DEdge*)re)->_pos = _cur->_edges.size();
   _cur->_edges.push_back((Rec2DEdge*)re);
-  
+
   _cur->_numEdge += re->getWeight();
   _cur->_2valEdge +=re->getWeightedQual();
 }
@@ -1130,7 +1130,7 @@ void Rec2DData::add(const Rec2DVertex *rv)
   }
   ((Rec2DVertex*)rv)->_pos = _cur->_vertices.size();
   _cur->_vertices.push_back((Rec2DVertex*)rv);
-  
+
   ++_cur->_numVert;
   _cur->_1valVert += rv->getQual(VertQuality);
   _cur->_2valVert += rv->getQual(VertEdgeQuality);
@@ -1145,7 +1145,7 @@ void Rec2DData::add(const Rec2DElement *rel)
   ((Rec2DElement*)rel)->_pos = _cur->_elements.size();
   _cur->_elements.push_back((Rec2DElement*)rel);
   _cur->_mel2rel[rel->getMElement()] = (Rec2DElement*)rel;
-  
+
 #if 1//def REC2D_DRAW
   MTriangle *t = rel->getMTriangle();
   MQuadrangle *q = rel->getMQuadrangle();
@@ -1164,7 +1164,7 @@ void Rec2DData::rmv(const Rec2DEdge *re)
   _cur->_edges[re->_pos] = _cur->_edges.back();
   _cur->_edges.pop_back();
   ((Rec2DEdge*)re)->_pos = -1;
-  
+
   _cur->_numEdge -= re->getWeight();
   _cur->_2valEdge -=re->getWeightedQual();
 }
@@ -1179,7 +1179,7 @@ void Rec2DData::rmv(const Rec2DVertex *rv)
   _cur->_vertices[rv->_pos] = _cur->_vertices.back();
   _cur->_vertices.pop_back();
   ((Rec2DVertex*)rv)->_pos = -1;
-  
+
   --_cur->_numVert;
   _cur->_1valVert -= rv->getQual(VertQuality);
   _cur->_2valVert -= rv->getQual(VertEdgeQuality);
@@ -1196,7 +1196,7 @@ void Rec2DData::rmv(const Rec2DElement *rel)
   _cur->_elements.pop_back();
   ((Rec2DElement*)rel)->_pos = -1;
   _cur->_mel2rel.erase(rel->getMElement());
-  
+
 #if 1//def REC2D_DRAW
   MTriangle *t = rel->getMTriangle();
   if (t) {
@@ -1262,7 +1262,7 @@ Rec2DAction* Rec2DData::getBestAction()
     return NULL;
   /*Action *ac = *std::max_element(_cur->_actions.begin(),
                                  _cur->_actions.end(), lessAction());
-  
+
   return const_cast<Rec2DAction*>(ac->action);*/
   return *(_cur->_sortedActions.begin());
 }
@@ -1282,7 +1282,7 @@ void Rec2DData::checkObsolete()
     if (_cur->_actions[i]->action->isObsolete())
       obsoletes.push_back((Rec2DAction*)_cur->_actions[i]->action);
   }
-  
+
   for (unsigned int i = 0; i < obsoletes.size(); ++i)
     delete obsoletes[i];
 }
@@ -1452,7 +1452,7 @@ void Rec2DData::associateParity(int pOld, int pNew, Rec2DDataChange *rdc)
     if (++a == 10)
       Msg::Warning("[Rec2DData] AND LOOK AT ME WHEN I TALK TO YOU !");
   }
-  
+
   std::map<int, std::vector<Rec2DVertex*> >::iterator it;
   std::vector<Rec2DVertex*> *vect, *vectNew;
   {
@@ -1475,7 +1475,7 @@ void Rec2DData::associateParity(int pOld, int pNew, Rec2DDataChange *rdc)
     vectNew->insert(vectNew->end(), vect->begin(), vect->end());
     _cur->_parities.erase(it);
   }
-  
+
   pOld = otherParity(pOld);
   pNew = otherParity(pNew);
   {
@@ -1525,18 +1525,18 @@ void Rec2DData::clearChanges()
 double Rec2DData::getGlobalQuality(Rec2DQualCrit crit)
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-  
+
   switch(crit) {
     case BlossomQuality :
       return _cur->_0blossomQuality;
-      
+
     case VertQuality :
       return static_cast<double>(_cur->_1valVert) / _cur->_numVert;
-    
+
     case VertEdgeQuality :
       return static_cast<double>(_cur->_2valVert) / _cur->_numVert
              *static_cast<double>(_cur->_2valEdge) / _cur->_numEdge;
-    
+
     default :
       Msg::Error("[Rec2DData:getGlobalQuality] Unknown quality criterion");
   }
@@ -1548,18 +1548,18 @@ double Rec2DData::getGlobalQuality(int numVert, double valVert,
                                    Rec2DQualCrit crit          )
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-  
+
   switch (crit) {
     case BlossomQuality :
       return _cur->_0blossomQuality;
-      
+
     case VertQuality :
       return (static_cast<double>(_cur->_1valVert) + valVert) / (_cur->_numVert + numVert);
-    
+
     case VertEdgeQuality :
       return (static_cast<double>(_cur->_2valVert) + valVert) / (_cur->_numVert + numVert)
              *(static_cast<double>(_cur->_2valEdge) + valEdge) / (_cur->_numEdge + numEdge);
-    
+
     default :
       Msg::Error("[Rec2DData:getGlobalQuality] Unknown quality criterion");
   }
@@ -1572,11 +1572,11 @@ void Rec2DData::updateVertQual(double val, Rec2DQualCrit crit)
     case VertQuality :
       _cur->_1valVert += val;
       return;
-    
+
     case VertEdgeQuality :
       _cur->_2valVert += val;
       return;
-    
+
     default :
       Msg::Error("[Rec2DData:updateVertQual] Unknown quality criterion");
   }
@@ -1995,13 +1995,13 @@ Rec2DChange::Rec2DChange(Rec2DVertex *rv,
       for (unsigned int i = 0; i < elem.size(); ++i)
         rv->add(elem[i]);
       break;
-      
+
     case RemoveElem :
       *vect = elem;
       for (int i = (int)elem.size()-1; i > -1; --i)
         rv->rmv(elem[i]);
       break;
-      
+
     default :
       delete vect;
       _type = Error;
@@ -2136,39 +2136,39 @@ void Rec2DChange::revert()
       Rec2DData::addBlosQual(-*(int*)_entity);
       delete (int*)_entity;
       break;
-      
+
     case HideEdge :
       ((Rec2DEdge*)_entity)->reveal();
       break;
-      
+
     case HideVertex :
       ((Rec2DVertex*)_entity)->reveal();
       break;
-      
+
     case HideElement :
       ((Rec2DElement*)_entity)->reveal();
       break;
-      
+
     case CreatedEdge :
       delete (Rec2DEdge*)_entity;
       break;
-      
+
     case CreatedVertex :
       delete (Rec2DVertex*)_entity;
       break;
-      
+
     case CreatedElement :
       delete (Rec2DElement*)_entity;
       break;
-      
+
     case HideAction :
       ((Rec2DAction*)_entity)->reveal();
       break;
-      
+
     case CreatedAction :
       delete (Rec2DAction*)_entity;
       break;
-      
+
     case HideActions :
       {
         std::vector<Rec2DAction*> *vect = (std::vector<Rec2DAction*>*)_entity;
@@ -2177,7 +2177,7 @@ void Rec2DChange::revert()
         delete vect;
       }
       break;
-      
+
     case CreatedActions :
       {
         std::vector<Rec2DAction*> *vect = (std::vector<Rec2DAction*>*)_entity;
@@ -2186,7 +2186,7 @@ void Rec2DChange::revert()
         delete vect;
       }
       break;
-      
+
     case SwapEdgeInAction :
       {
         std::vector<Rec2DAction*> *vect = (std::vector<Rec2DAction*>*)_entity;
@@ -2198,7 +2198,7 @@ void Rec2DChange::revert()
         delete pairEdge;
       }
       break;
-      
+
     case SwapEdgeInElem :
       {
         std::pair<Rec2DEdge*, Rec2DEdge*> *pairEdge;
@@ -2207,7 +2207,7 @@ void Rec2DChange::revert()
         delete pairEdge;
       }
       break;
-      
+
     case SwapVertInAction :
       {
         std::vector<Rec2DAction*> *vect = (std::vector<Rec2DAction*>*)_entity;
@@ -2219,7 +2219,7 @@ void Rec2DChange::revert()
         delete pairVert;
       }
       break;
-      
+
     case SwapVertInEdge :
       {
         std::vector<Rec2DEdge*> *edges = (std::vector<Rec2DEdge*>*)_entity;
@@ -2231,7 +2231,7 @@ void Rec2DChange::revert()
         delete pairVert;
       }
       break;
-      
+
     case SwapMVertInElement :
       {
         std::vector<Rec2DElement*> *elem = (std::vector<Rec2DElement*>*)_entity;
@@ -2243,7 +2243,7 @@ void Rec2DChange::revert()
         delete pairVert;
       }
       break;
-      
+
     case RemoveElem :
       {
         std::vector<Rec2DElement*> *elem = (std::vector<Rec2DElement*>*)_info;
@@ -2252,7 +2252,7 @@ void Rec2DChange::revert()
         delete elem;
       }
       break;
-      
+
     case AddElem :
       {
         std::vector<Rec2DElement*> *elem = (std::vector<Rec2DElement*>*)_info;
@@ -2261,17 +2261,17 @@ void Rec2DChange::revert()
         delete elem;
       }
       break;
-      
+
     case Relocate :
       ((Rec2DVertex*)_entity)->relocate(*(SPoint2*)_info);
       delete (SPoint2*)_info;
       break;
-      
+
     case ChangePar :
       ((Rec2DVertex*)_entity)->setParity(*(int*)_info);
       delete (int*)_info;
       break;
-      
+
     case SavePar :
       {
         std::vector<Rec2DVertex*> *verts = (std::vector<Rec2DVertex*>*)_entity;
@@ -2282,15 +2282,15 @@ void Rec2DChange::revert()
         delete parities;
       }
       break;
-      
+
     case Error :
       Msg::Error("[Rec2DChange] There was an error");
       return;
-      
+
     case Reverted :
       Msg::Error("[Rec2DChange] Multiple revert");
       return;
-      
+
     default :
       Msg::Error("[Rec2DChange] Unknown type (%d)", _type);
       return;
@@ -2383,7 +2383,7 @@ double Rec2DAction::getReward() const
 {
   if (_lastUpdate < Recombine2D::getNumChange())
     ((Rec2DAction*)this)->_computeGlobQual();
-  
+
   return _globQualIfExecuted/* - Rec2DData::getGlobalQuality()*/;
 }
 
@@ -2434,7 +2434,7 @@ Rec2DTwoTri2Quad::Rec2DTwoTri2Quad(Rec2DElement *el0, Rec2DElement *el1)
   _triangles[0] = el0;
   _triangles[1] = el1;
   _edges[4] = Rec2DElement::getCommonEdge(el0, el1);
-  
+
   // get edges
   std::vector<Rec2DEdge*> edges;
   el0->getMoreEdges(edges);
@@ -2457,7 +2457,7 @@ Rec2DTwoTri2Quad::Rec2DTwoTri2Quad(Rec2DElement *el0, Rec2DElement *el1)
     _edges[2] = _edges[3];
     _edges[3] = re;
   }
-  
+
   // get vertices
   _vertices[0] = _edges[4]->getVertex(0);
   _vertices[1] = _edges[4]->getVertex(1);
@@ -2469,14 +2469,14 @@ Rec2DTwoTri2Quad::Rec2DTwoTri2Quad(Rec2DElement *el0, Rec2DElement *el1)
     _vertices[0] = _vertices[1];
     _vertices[1] = rv;
   }
-  
+
   //
   _rt = new RecombineTriangle(MEdge(_vertices[0]->getMVertex(),
                                     _vertices[1]->getMVertex() ),
                               _triangles[0]->getMElement(),
                               _triangles[1]->getMElement()       );
   reveal();
-  
+
   if (!edgesAreInOrder(_edges, 4)) Msg::Error("recomb |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
 }
 
@@ -2511,7 +2511,7 @@ void Rec2DTwoTri2Quad::hide()
 }
 
 void Rec2DTwoTri2Quad::reveal()
-{ 
+{
   if (_triangles[0])
     _triangles[0]->add(this);
   if (_triangles[1])
@@ -2540,7 +2540,7 @@ void Rec2DTwoTri2Quad::apply(std::vector<Rec2DVertex*> &newPar)
     Msg::Error("[Rec2DTwoTri2Quad] No way ! I won't apply ! Find someone else...");
     return;
   }
-  
+
   int min = Rec2DData::getNewParity(), index = -1;
   for (int i = 0; i < 4; ++i) {
     if (_vertices[i]->getParity() && min > _vertices[i]->getParity()) {
@@ -2570,25 +2570,25 @@ void Rec2DTwoTri2Quad::apply(std::vector<Rec2DVertex*> &newPar)
       }
     }
   }
-  
+
   _triangles[0]->rmv(this);
   _triangles[1]->rmv(this);
   // hide() instead
-  
+
   std::vector<Rec2DAction*> actions;
   _triangles[0]->getMoreUniqueActions(actions);
   _triangles[1]->getMoreUniqueActions(actions);
   for (unsigned int i = 0; i < actions.size(); ++i)
     delete actions[i];
-  
+
   delete _triangles[0];
   delete _triangles[1];
   _triangles[0] = NULL;
   _triangles[1] = NULL;
   delete _edges[4];
-  
+
   new Rec2DElement((MQuadrangle*)NULL, (const Rec2DEdge**)_edges);
-  
+
   Recombine2D::incNumChange();*/
 }
 
@@ -2727,7 +2727,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
     else Msg::Info("no edge");
     return false;
   }
-  
+
   std::vector<Rec2DEdge*> edges;
   Rec2DEdge *re[4];
   _triangles[0]->getMoreEdges(edges);
@@ -2761,7 +2761,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
       return false;
     }
   }
-  
+
   if (_edges[0]->getOtherVertex(_vertices[2]) == _edges[4]->getVertex(0)) {
     if (_vertices[0] != _edges[4]->getVertex(0) || _vertices[1] != _edges[4]->getVertex(1)) {
       Msg::Error("inco action [2], |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
@@ -2782,7 +2782,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
     Msg::Error("inco action [5], |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
     return false;
   }
-  
+
   const Rec2DAction *ra;
   if (action) ra = action;
   else ra = this;
@@ -2790,7 +2790,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
     Msg::Error("inco action [6], |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
     return false;
   }
-  
+
   if (isObsolete()) {
     int p[4];
     p[0] = _vertices[0]->getParity();
@@ -2801,7 +2801,7 @@ bool Rec2DTwoTri2Quad::checkCoherence(const Rec2DAction *action) const
     Msg::Error("inco action [7], |%d|%d|", _triangles[0]->getNum(), _triangles[1]->getNum());
     return false;
   }
-  
+
   return true;
 }
 
@@ -2825,7 +2825,7 @@ void Rec2DTwoTri2Quad::printReward() const
     double valEdge2 = 0;
     for (int i = 0; i < 4; ++i)
       valEdge2 += _edges[i]->getQual();
-    
+
     double valVert;
     valVert = _vertices[0]->getGainRecomb(_triangles[0], _triangles[1]);
     valVert += _vertices[1]->getGainRecomb(_triangles[0], _triangles[1]);
@@ -2921,7 +2921,7 @@ void Rec2DTwoTri2Quad::_computeGlobQual()
                                             _edges[4], _edges[1], _edges[2]);
     _valVert += _vertices[2]->getGainQuad(_triangles[0], _edges[0], _edges[1]);
     _valVert += _vertices[3]->getGainQuad(_triangles[1], _edges[2], _edges[3]);
-    
+
     _globQualIfExecuted = Rec2DData::getGlobalQuality(0, _valVert);
     _lastUpdate = Recombine2D::getNumChange();
     return;
@@ -2930,13 +2930,13 @@ void Rec2DTwoTri2Quad::_computeGlobQual()
     double valEdge = -Recombine2D::getWeightEdgeBase() * _edges[4]->getQual();
     for (int i = 0; i < 4; ++i)
       valEdge += Recombine2D::getWeightEdgeQuad() * _edges[i]->getQual();
-    
+
     if (_vertices[0]->getLastUpdate() > _lastUpdate ||
         _vertices[1]->getLastUpdate() > _lastUpdate   ) {
       _valVert = _vertices[0]->getGainRecomb(_triangles[0], _triangles[1]);
       _valVert += _vertices[1]->getGainRecomb(_triangles[0], _triangles[1]);
     }
-    
+
     double w = 4*Recombine2D::getWeightEdgeQuad()
                - Recombine2D::getWeightEdgeBase();
     _globQualIfExecuted = Rec2DData::getGlobalQuality(0, _valVert, w, valEdge);
@@ -2954,7 +2954,7 @@ void Rec2DTwoTri2Quad::_computeReward()
     case BlossomQuality :
       _reward = (int)_rt->total_gain;
       return;
-      
+
     case VertQuality :
       _valVert = .0;
       _valVert += _vertices[0]->getGainRecomb(_triangles[0], _triangles[1],
@@ -2963,33 +2963,33 @@ void Rec2DTwoTri2Quad::_computeReward()
                                               _edges[4], _edges[1], _edges[2]);
       _valVert += _vertices[2]->getGainQuad(_triangles[0], _edges[0], _edges[1]);
       _valVert += _vertices[3]->getGainQuad(_triangles[1], _edges[2], _edges[3]);
-      
+
       _reward = Rec2DData::getGlobalQuality(0, _valVert)
                 - Rec2DData::getGlobalQuality();
       _lastUpdate = Recombine2D::getNumChange();
       return;
-    
+
     case VertEdgeQuality :
     {
       double valEdge = -Recombine2D::getWeightEdgeBase() * _edges[4]->getQual();
       for (int i = 0; i < 4; ++i)
         valEdge += Recombine2D::getWeightEdgeQuad() * _edges[i]->getQual();
-      
+
       if (_vertices[0]->getLastUpdate() > _lastUpdate ||
           _vertices[1]->getLastUpdate() > _lastUpdate   ) {
         _valVert = _vertices[0]->getGainRecomb(_triangles[0], _triangles[1]);
         _valVert += _vertices[1]->getGainRecomb(_triangles[0], _triangles[1]);
       }
-      
+
       double w = 4*Recombine2D::getWeightEdgeQuad()
                  - Recombine2D::getWeightEdgeBase();
       _reward = Rec2DData::getGlobalQuality(0, _valVert, w, valEdge)
                 - Rec2DData::getGlobalQuality();
-      
+
       _lastUpdate = Recombine2D::getNumChange();
       return;
     }
-    
+
     default :
       Msg::Error("[Rec2DTwoTri2Quad:_computeReward] Unknown quality criterion %d", crit);
   }
@@ -3146,7 +3146,7 @@ void Rec2DCollapse::apply(Rec2DDataChange *rdc,
                   _rec->_edges[1]->getVertex(1) == vKO   ;
   rdc->swapFor(vKO, vOK);
   rdc->hide(vKO);
-  
+
   int i0, i1, i2, i3;
   if (edge12KO) {
     i0 = 1; i1 = 2;
@@ -3191,7 +3191,7 @@ void Rec2DCollapse::apply(Rec2DDataChange *rdc,
       }
     }
   }
-  
+
   int parKO, parOK;
   if ((parKO = vKO->getParity())) {
     if (!(parOK = vOK->getParity()))
@@ -3199,7 +3199,7 @@ void Rec2DCollapse::apply(Rec2DDataChange *rdc,
     else if (parOK/2 != parKO/2)
       Rec2DData::associateParity(std::max(parOK, parKO), std::min(parOK, parKO), rdc);
   }
-  
+
   rdc->checkObsoleteActions(_rec->_vertices, 4);
 }
 
@@ -3226,7 +3226,7 @@ void Rec2DCollapse::printReward() const
     _rec->_vertices[1]->getParam(&p[1]);
     int b0 = _rec->_vertices[0]->getOnBoundary();
     int b1 = _rec->_vertices[1]->getOnBoundary();
-    
+
     double valVert = .0;
     if (b0 || b1) {
       int iOK = 1, iKO = 0;
@@ -3237,22 +3237,22 @@ void Rec2DCollapse::printReward() const
       double oldValVert = Rec2DData::getSumVert();
       _rec->_vertices[iKO]->relocate(p[iOK]);
       double qualRelocation = Rec2DData::getSumVert() - oldValVert;
-      
+
       valVert += _rec->_vertices[iOK]->getGainMerge(_rec->_vertices[iKO],
                                                     &_rec->_edges[1], 2  );
       valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[1]);
       valVert += _rec->_vertices[3]->getGainTriLess(_rec->_edges[2]);
-      
+
       for (int i = 0; i < 4; ++i) {
         Msg::Info("vert %d : %g", _rec->_vertices[i]->getNum(), _rec->_vertices[i]->getQual());
       }
-      
+
       Msg::Info("qual col %g %g %g %g", qualRelocation,
                 _rec->_vertices[iOK]->getGainMerge(_rec->_vertices[iKO], &_rec->_edges[1], 2),
                 _rec->_vertices[2]->getGainTriLess(_rec->_edges[1]),
                 _rec->_vertices[3]->getGainTriLess(_rec->_edges[2])
                );
-      
+
       _rec->_vertices[iKO]->relocate(p[iKO]);
     }
     else {
@@ -3263,22 +3263,22 @@ void Rec2DCollapse::printReward() const
       _rec->_vertices[0]->relocate(pNew);
       _rec->_vertices[1]->relocate(pNew);
       double qualRelocation = Rec2DData::getSumVert() - oldValVert;
-      
+
       valVert += _rec->_vertices[0]->getGainMerge(_rec->_vertices[1],
                                                   &_rec->_edges[1], 2);
-      valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[0]); //FIX normal ? 
+      valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[0]); //FIX normal ?
       valVert += _rec->_vertices[3]->getGainTriLess(_rec->_edges[2]);
-      
+
       for (int i = 0; i < 4; ++i) {
         Msg::Info("vert %d : %g", _rec->_vertices[i]->getNum(), _rec->_vertices[i]->getQual());
       }
-      
+
       Msg::Info("qual col %g %g %g %g", qualRelocation,
                 _rec->_vertices[0]->getGainMerge(_rec->_vertices[1], &_rec->_edges[1], 2),
                 _rec->_vertices[2]->getGainTriLess(_rec->_edges[1]),
                 _rec->_vertices[3]->getGainTriLess(_rec->_edges[2])
                );
-      
+
       _rec->_vertices[0]->relocate(p[0]);
       _rec->_vertices[1]->relocate(p[1]);
     }
@@ -3311,7 +3311,7 @@ void Rec2DCollapse::printReward() const
       }
       if (toAdd) verts.push_back(v);
     }
-    
+
     _rec->_vertices[0]->getMoreUniqueEdges(edges);
     _rec->_vertices[1]->getMoreUniqueEdges(edges);
     int numEdgeBef = edges.size(), weightEdgeBef = 0;
@@ -3320,7 +3320,7 @@ void Rec2DCollapse::printReward() const
       valEdgeBef += edges[i]->getWeightedQual();
       weightEdgeBef += edges[i]->getWeight();
     }
-    
+
     int numVertOther = verts.size();
     double vert01Bef = 0, vert23Bef = 0, vertOtherBef = 0;
     vert01Bef += _rec->_vertices[0]->getQual();
@@ -3330,10 +3330,10 @@ void Rec2DCollapse::printReward() const
     for (unsigned int i = 0; i < verts.size(); ++i) {
       vertOtherBef += verts[i]->getQual();
     }
-    
+
     Rec2DNode *n = new Rec2DNode(NULL, (Rec2DAction*)this, 0);
     n->makeChanges();
-    
+
     edges.clear();
     _rec->_vertices[0]->getMoreUniqueEdges(edges);
     _rec->_vertices[1]->getMoreUniqueEdges(edges);
@@ -3343,7 +3343,7 @@ void Rec2DCollapse::printReward() const
       valEdgeAft += edges[i]->getWeightedQual();
       weightEdgeAft += edges[i]->getWeight();
     }
-    
+
     double vert01Aft = 0, vert23Aft = 0, vertOtherAft = 0;
     if (_rec->_vertices[0]->getNumElements())
       vert01Aft += _rec->_vertices[0]->getQual();
@@ -3354,10 +3354,10 @@ void Rec2DCollapse::printReward() const
     for (unsigned int i = 0; i < verts.size(); ++i) {
       vertOtherAft += verts[i]->getQual();
     }
-    
+
     n->revertChanges();
     delete n;
-    
+
     Msg::Info("-(%d)%de%g +(%d)%de%g "
               "-4v%g +2v%g +0v%g +(%d)0v%g",
               numEdgeBef, weightEdgeBef, valEdgeBef/weightEdgeBef,
@@ -3385,13 +3385,13 @@ void Rec2DCollapse::_computeGlobQual()
     _lastUpdate = Recombine2D::getNumChange();
     return;
   }
-  
+
   SPoint2 p[2];
   _rec->_vertices[0]->getParam(&p[0]);
   _rec->_vertices[1]->getParam(&p[1]);
   int b0 = _rec->_vertices[0]->getOnBoundary();
   int b1 = _rec->_vertices[1]->getOnBoundary();
-  
+
   if (Recombine2D::blossomQual()) {
     Msg::Error("[Rec2DCollapse] Don't know");
     //?return (double)_cur->_blossomQuality;
@@ -3406,13 +3406,13 @@ void Rec2DCollapse::_computeGlobQual()
         iKO = 1;
       }
       _rec->_vertices[iKO]->relocate(p[iOK]);
-      
+
       valVert += _rec->_vertices[iOK]->getGainMerge(_rec->_vertices[iKO],
                                                     &_rec->_edges[1], 2  );
       valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[1]);
       valVert += _rec->_vertices[3]->getGainTriLess(_rec->_edges[2]);
       _globQualIfExecuted = Rec2DData::getGlobalQuality(-1, valVert);
-      
+
       _rec->_vertices[iKO]->relocate(p[iKO]);
     }
     else {
@@ -3421,13 +3421,13 @@ void Rec2DCollapse::_computeGlobQual()
       SPoint2 pNew(u, v);
       _rec->_vertices[0]->relocate(pNew);
       _rec->_vertices[1]->relocate(pNew);
-      
+
       valVert += _rec->_vertices[0]->getGainMerge(_rec->_vertices[1],
                                                   &_rec->_edges[1], 2);
       valVert += _rec->_vertices[2]->getGainTriLess(_rec->_edges[0]);
       valVert += _rec->_vertices[3]->getGainTriLess(_rec->_edges[2]);
       _globQualIfExecuted = Rec2DData::getGlobalQuality(-1, valVert);
-      
+
       _rec->_vertices[0]->relocate(p[0]);
       _rec->_vertices[1]->relocate(p[1]);
     }
@@ -3444,7 +3444,7 @@ void Rec2DCollapse::_computeGlobQual()
         iKO = 1;
       }
       _rec->_vertices[iKO]->relocate(p[iOK]);
-      
+
       valVert += _rec->_vertices[2]->getGainOneElemLess();
       valVert += _rec->_vertices[3]->getGainOneElemLess();
       valVert += _rec->_vertices[iOK]->getGainMerge(_rec->_vertices[iKO]);
@@ -3453,10 +3453,10 @@ void Rec2DCollapse::_computeGlobQual()
       numEdge -= 2 * Recombine2D::getWeightEdgeBase();
       valEdge -= _rec->_edges[4]->getWeightedQual();
       numEdge -= _rec->_edges[4]->getWeight();
-      
+
       _globQualIfExecuted = Rec2DData::getGlobalQuality(-1, valVert,
                                                         numEdge, valEdge);
-      
+
       _rec->_vertices[iKO]->relocate(p[iKO]);
     }
     else {
@@ -3465,7 +3465,7 @@ void Rec2DCollapse::_computeGlobQual()
       SPoint2 pNew(u, v);
       _rec->_vertices[0]->relocate(pNew);
       _rec->_vertices[1]->relocate(pNew);
-      
+
       valVert += _rec->_vertices[2]->getGainOneElemLess();
       valVert += _rec->_vertices[3]->getGainOneElemLess();
       valVert += _rec->_vertices[0]->getGainMerge(_rec->_vertices[1]);
@@ -3474,10 +3474,10 @@ void Rec2DCollapse::_computeGlobQual()
       numEdge -= 2 * Recombine2D::getWeightEdgeBase();
       valEdge -= _rec->_edges[4]->getWeightedQual();
       numEdge -= _rec->_edges[4]->getWeight();
-      
+
       _globQualIfExecuted = Rec2DData::getGlobalQuality(-1, valVert,
                                                         numEdge, valEdge);
-      
+
       _rec->_vertices[0]->relocate(p[0]);
       _rec->_vertices[1]->relocate(p[1]);
     }
@@ -3597,7 +3597,7 @@ void Rec2DEdge::updateQual()
   double diffQual = _qual;
   _computeQual();
   diffQual = _weight*(_qual-diffQual);
-  
+
   _rv0->updateWAQualEdges(diffQual);
   _rv1->updateWAQualEdges(diffQual);
   Rec2DData::updateEdgeQual(diffQual);
@@ -3631,7 +3631,7 @@ bool Rec2DEdge::checkCoherence() const
 {
   if (_rv0 == _rv1) return false;
   if (!_rv0->has(this) || !_rv1->has(this)) return false;
-  
+
   Rec2DElement *elem[2];
   Rec2DEdge::getElements(this, elem);
   if (elem[1]) {
@@ -3655,7 +3655,7 @@ void Rec2DEdge::print() const
     a = elem[0]->getNum();
   if (elem[1])
     b = elem[1]->getNum();
-  
+
   Msg::Info(" edge , %d--%d , %d/%d", _rv0->getNum(), _rv1->getNum(), a, b);
 }
 
@@ -3665,7 +3665,7 @@ void Rec2DEdge::_computeQual()
   double adimLength = _straightAdimLength();
   if (adimLength > 1)
     adimLength = 1./adimLength;
-  
+
   _qual = (Recombine2D::getCoefLengOrientQual() * alignment
            + Recombine2D::getCoefLengthQual()              ) * adimLength
           + Recombine2D::getCoefOrientQual() * alignment;
@@ -3682,7 +3682,7 @@ void Rec2DEdge::_addWeight(int w)
   if (_weight < Recombine2D::getWeightEdgeBase()) {
     Msg::Error("[Rec2DEdge] Weight too low");
   }
-  
+
   double diffQual = w*getQual();
   _rv0->updateWAQualEdges(diffQual, w);
   _rv1->updateWAQualEdges(diffQual, w);
@@ -3700,10 +3700,10 @@ double Rec2DEdge::_straightAdimLength() const
   double length = sqrt(dx * dx + dy * dy + dz * dz);
   delete[] xyz0;
   delete[] xyz1;
-  
+
   double lc0 = (*Recombine2D::bgm())(_rv0->u(), _rv0->v(), .0);
   double lc1 = (*Recombine2D::bgm())(_rv1->u(), _rv1->v(), .0);
-  
+
   return length * (1./lc0 + 1./lc1) / 2.;
 }
 
@@ -3712,17 +3712,17 @@ double Rec2DEdge::_straightAlignment() const
   double angle0 = Recombine2D::bgm()->getAngle(_rv0->u(), _rv0->v(), .0);
   double angle1 = Recombine2D::bgm()->getAngle(_rv1->u(), _rv1->v(), .0);
   double angleEdge = atan2(_rv0->v()-_rv1->v(), _rv0->u()-_rv1->u());
-  
+
   double alpha0 = angleEdge - angle0;
   double alpha1 = angleEdge - angle1;
   crossField2d::normalizeAngle(alpha0);
   crossField2d::normalizeAngle(alpha1);
   alpha0 = 1. - 4. * std::min(alpha0, .5 * M_PI - alpha0) / M_PI;
   alpha1 = 1. - 4. * std::min(alpha1, .5 * M_PI - alpha1) / M_PI;
-  
+
   double lc0 = (*Recombine2D::bgm())(_rv0->u(), _rv0->v(), .0);
   double lc1 = (*Recombine2D::bgm())(_rv1->u(), _rv1->v(), .0);
-  
+
   return (alpha0/lc0 + alpha1/lc1) / (1./lc0 + 1./lc1);
 }
 
@@ -3751,13 +3751,13 @@ Rec2DVertex::Rec2DVertex(Rec2DVertex *rv, double ang)
   _elements(rv->_elements), _param(rv->_param), _pos(-1)
 {
   rv->hide(false);
-  
+
   // swap the two vertices in edges
   for (unsigned int i = 0; i < _edges.size(); ++i) {
     _edges[i]->swap(rv, this, false);
   }
   rv->_edges.clear();
-  
+
   // swap the two vertices in actions
   std::vector<Rec2DAction*> actions;
   for (unsigned int i = 0; i < _elements.size(); ++i) {
@@ -3767,7 +3767,7 @@ Rec2DVertex::Rec2DVertex(Rec2DVertex *rv, double ang)
     if (actions[i]->isRecomb()) actions[i]->swap(rv, this);
   }
   rv->_elements.clear();
-  
+
   // end
   reveal();
   delete rv;
@@ -3785,7 +3785,7 @@ void Rec2DVertex::hide(bool check)
     Msg::Error("[Rec2DVertex] I have %d elements and %d edges", _elements.size(), _edges.size());
   if (_parity)
     Rec2DData::removeParity(this, _parity);
-  
+
   Rec2DData::rmv(this);
 }
 
@@ -3793,7 +3793,7 @@ void Rec2DVertex::reveal()
 {
   if (_parity)
     Rec2DData::addParity(this, _parity);
-  
+
   Rec2DData::add(this);
 }
 
@@ -3803,7 +3803,7 @@ void Rec2DVertex::initStaticTable()
   // _gains[onWhat][numEl];     onWhat={0:edge,1:face} (earning of adding an element)
   if (_qualVSnum == NULL) {
     int nE = 10, nF = 20; //edge, face
-    
+
     _qualVSnum = new double*[2];
     _qualVSnum[0] = new double[nE];
     _qualVSnum[1] = new double[nF];
@@ -3813,7 +3813,7 @@ void Rec2DVertex::initStaticTable()
       _qualVSnum[0][i] = 1. - fabs(2./i - 1.);
     for (int i = 1; i < nF; ++i)
       _qualVSnum[1][i] = std::max(1. - fabs(4./i - 1.), .0);
-      
+
     _gains = new double*[2];
     _gains[0] = new double[nE-1];
     _gains[1] = new double[nF-1];
@@ -3832,14 +3832,14 @@ void Rec2DVertex::add(const Rec2DEdge *re)
       return;
     }
   }
-  
+
   double oldQual = getQual(VertQuality);
-  
+
   _edges.push_back(const_cast<Rec2DEdge*>(re));
   _sumWQualEdge += re->getWeightedQual();
   _sumWeightEdge += re->getWeight();
   _lastUpdate = Recombine2D::getNumChange();
-  
+
   Rec2DData::updateVertQual(getQual(VertQuality)-oldQual, VertQuality);
 }
 
@@ -3856,9 +3856,9 @@ void Rec2DVertex::rmv(const Rec2DEdge *re)
   unsigned int i = 0;
   while (i < _edges.size()) {
     if (_edges[i] == re) {
-      
+
       double oldQual = getQual(VertQuality);
-      
+
       _edges[i] = _edges.back();
       _edges.pop_back();
       _sumWQualEdge -= re->getWeightedQual();
@@ -3866,7 +3866,7 @@ void Rec2DVertex::rmv(const Rec2DEdge *re)
       if (_sumWeightEdge < 0 || _sumWQualEdge < -1e12)
         Msg::Error("[Rec2DVertex] Negative sum edge %d %g", _sumWeightEdge, _sumWQualEdge);
       _lastUpdate = Recombine2D::getNumChange();
-      
+
       Rec2DData::updateVertQual(getQual(VertQuality)-oldQual, VertQuality);
       return;
     }
@@ -3883,15 +3883,15 @@ void Rec2DVertex::add(const Rec2DElement *rel)
       return;
     }
   }
-  
+
   double oldQual1 = getQual(VertQuality);
   double oldQual2 = getQual(VertEdgeQuality);
-  
+
   _elements.push_back(const_cast<Rec2DElement*>(rel));
   _sumWeightAngle += rel->getAngleWeight();
   _sumWQualAngle += rel->getWeightedAngleQual(this);
   _lastUpdate = Recombine2D::getNumChange();
-  
+
   Rec2DData::updateVertQual(getQual(VertQuality)-oldQual1, VertQuality);
   Rec2DData::updateVertQual(getQual(VertEdgeQuality)-oldQual2, VertEdgeQuality);
 }
@@ -3910,16 +3910,16 @@ void Rec2DVertex::rmv(const Rec2DElement *rel)
   unsigned int i = 0;
   while (i < _elements.size()) {
     if (_elements[i] == rel) {
-      
+
       double oldQual1 = getQual(VertQuality);
       double oldQual2 = getQual(VertEdgeQuality);
-      
+
       _sumWeightAngle -= _elements[i]->getAngleWeight();
       _sumWQualAngle -= _elements[i]->getWeightedAngleQual(this);
       _elements[i] = _elements.back();
       _elements.pop_back();
       _lastUpdate = Recombine2D::getNumChange();
-      
+
       Rec2DData::updateVertQual(getQual(VertQuality)-oldQual1, VertQuality);
       Rec2DData::updateVertQual(getQual(VertEdgeQuality)-oldQual2, VertEdgeQuality);
       return;
@@ -3991,7 +3991,7 @@ void Rec2DVertex::setOnBoundary()
     Rec2DData::updateVertQual(getQual(VertEdgeQuality)-oldQual2, VertEdgeQuality);
     _lastUpdate = Recombine2D::getNumChange();
   }
-  
+
 }
 
 void Rec2DVertex::setParity(int p, bool tree)
@@ -4000,7 +4000,7 @@ void Rec2DVertex::setParity(int p, bool tree)
     //Msg::Warning("[Rec2DVertex] I don't like to do it. Think about that !");
     Rec2DData::removeParity(this, _parity);
   }
-  
+
   if ((_parity = p))
     Rec2DData::addParity(this, _parity);
 #ifdef REC2D_DRAW
@@ -4018,7 +4018,7 @@ void Rec2DVertex::setParityWD(int pOld, int pNew)
   if (pOld != _parity)
     Msg::Error("[Rec2DVertex] Old parity was not correct");
   _parity = pNew;
-  
+
 #ifdef REC2D_DRAW
   if (_v)
     _v->setIndex(_parity);
@@ -4061,13 +4061,13 @@ double Rec2DVertex::getGainDegree(int n) const
 {
   if (!n)
     return .0;
-  int numElem = (int)_elements.size();  
+  int numElem = (int)_elements.size();
   if (numElem + n < 0) {
     Msg::Error("[Rec2DVertex] gain for %d elements not available",
                numElem + n                             );
     return .0;
   }
-  
+
   if (_onWhat > -1) {
     switch (n) {
       case 1 :
@@ -4079,17 +4079,17 @@ double Rec2DVertex::getGainDegree(int n) const
                - _qualVSnum[_onWhat][numElem-1];
     }
   }
-  
+
   if (numElem == 0) {
     Msg::Error("[Rec2DVertex] I don't want this anymore !");
     return 11. - fabs(2./M_PI * _angle/(double)(numElem + n) - 1.);
   }
-  
+
   if (numElem + n == 0) {
     Msg::Error("[Rec2DVertex] I don't want this anymore !");
     return fabs(2./M_PI * _angle/(double)numElem - 1.) - 11.;
   }
-  
+
   return fabs(2./M_PI * _angle/(double)numElem - 1.)
          - fabs(2./M_PI * _angle/(double)(numElem + n) - 1.);
 }
@@ -4097,14 +4097,14 @@ double Rec2DVertex::getGainDegree(int n) const
 double Rec2DVertex::getQual(Rec2DQualCrit crit) const
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-  
+
   switch (crit) {
     case VertQuality :
       return _vertQual() * _WAQualEdges();
-    
+
     case VertEdgeQuality :
       return _vertQual();
-    
+
     default :
       Msg::Error("[Rec2DVertex:getQual-1] Unknown quality criterion %d", crit);
       Msg::Error("");
@@ -4118,17 +4118,17 @@ double Rec2DVertex::getQual(double waQualAngles, double waQualEdges,
                             int numElem, Rec2DQualCrit crit) const
 {
   if (crit == ChoosedCrit) crit = Recombine2D::getQualCrit();
-    
+
   static int a = 0;
   if (++a == 1) Msg::Warning("FIXME NoCrit==-2, ChoosedCrit==-1");
-  
+
   switch (crit) {
     case VertQuality :
       return _vertQual(_qualDegree(numElem), waQualAngles) * waQualEdges;
-    
+
     case VertEdgeQuality :
       return _vertQual(_qualDegree(numElem), waQualAngles);
-    
+
     default :
       Msg::Error("[Rec2DVertex:getQual-2] Unknown quality criterion %d", crit);
   }
@@ -4142,13 +4142,13 @@ double Rec2DVertex::/*vertQual_*/getGainQuad(const Rec2DElement *rel,
   double wa = Recombine2D::getWeightAngleQuad()
              - Recombine2D::getWeightAngleTri();
   double wq = Recombine2D::getWeightEdgeQuad();
-  
+
   double qualAngle = _sumWQualAngle + wa * rel->getAngleQual(this) ;
   int sumAngle = _sumWeightAngle + wa;
-  
+
   double qualEdge = _sumWQualEdge + wq * re0->getQual() + wq * re1->getQual();
   int sumEdge = _sumWeightEdge + 2*wq;
-  
+
   return getQual(qualAngle/sumAngle, qualEdge/sumEdge,
                  (int)_elements.size()                ) - getQual();
 }
@@ -4173,37 +4173,37 @@ double Rec2DVertex::getGainRecomb(/*Rec2DQualCrit crit,*/
     Msg::Error("[Rec2DVertex] Cannot compute gain of recombination if elements aren't triangles");
     return -1.;
   }
-  
+
   //if (crit == BlossomQuality) return .0;
   //if (crit < 0) {
     Msg::Warning("[Rec2DVertex] Give me another criterion please.");
   // }
-  
+
   double swQualAngle = _sumWQualAngle, swQualEdge = _sumWQualEdge;
   int swAngle = _sumWeightAngle, swEdge = _sumWeightEdge;
-  
+
   double wat = Recombine2D::getWeightAngleTri(),
          waq = Recombine2D::getWeightAngleQuad(),
          weq = Recombine2D::getWeightEdgeQuad(),
          web = Recombine2D::getWeightEdgeBase();
-  
+
   swQualAngle -= wat * rel1->getAngleQual(this);
   swQualAngle -= wat * rel2->getAngleQual(this);
   swQualAngle += waq * Recombine2D::angle2qual(rel1->getAngle(this)
                                              + rel2->getAngle(this));
   swAngle += waq - 2 * wat;
-  
+
   if (re2) {
     swQualEdge -= web * re0->getQual();
     swQualEdge += weq * re1->getQual();
     swQualEdge += weq * re2->getQual();
     swEdge += 2 * weq - web;
   }
-  
+
   return getQual(swQualAngle / swAngle, swQualEdge / swEdge,
                  static_cast<int>(_elements.size())-1/*, crit*/)
          - getQual(/*crit*/);
-         
+
   //FIX verifier que c'est bien ce qui est demande ! (renvoie bien ce que veux apply, compute reward, ...)
 }
 
@@ -4253,7 +4253,7 @@ double Rec2DVertex::/*vertQual_*/getGainMerge(const Rec2DVertex *rv,
     sumQualAngle += qualAngle[i];
   }
   int numElem = _elements.size() + rv->_elements.size() - 4;
-  
+
   int sumEdge = 0;
   double sumQualEdge = .0;
   for (unsigned int i = 0; i < _edges.size(); ++i) {
@@ -4268,7 +4268,7 @@ double Rec2DVertex::/*vertQual_*/getGainMerge(const Rec2DVertex *rv,
     sumEdge -= Recombine2D::getWeightEdgeBase();
     sumQualEdge -= Recombine2D::getWeightEdgeBase() * edges[i]->getQual();
   }
-  
+
   return Rec2DVertex::getQual(sumQualAngle/sumAngle,
                               sumQualEdge/sumEdge, numElem)
          - getQual() - rv->getQual()                        ;
@@ -4307,8 +4307,8 @@ double Rec2DVertex::/*vertEdgeQual_*/getGainMerge(const Rec2DVertex *rv) const
     sumQualAngle += qualAngle[i];
     sumAngle += angleWeight[i];
   }
-  
-  int numElem = _elements.size() + rv->_elements.size() - 4; 
+
+  int numElem = _elements.size() + rv->_elements.size() - 4;
   ans += getQualDegree(numElem) + sumQualAngle / sumAngle;
   return ans;
 }
@@ -4317,11 +4317,11 @@ double Rec2DVertex::/*vertEdgeQual_*/getGainMerge(const Rec2DVertex *rv) const
 void Rec2DVertex::updateWAQualEdges(double d, int a)
 {
   double oldQual = getQual(VertQuality);
-  
+
   _sumWQualEdge += d;
   _sumWeightEdge += a;
   _lastUpdate = Recombine2D::getNumChange();
-  
+
   Rec2DData::updateVertQual(getQual(VertQuality)-oldQual, VertQuality);
 }
 
@@ -4361,7 +4361,7 @@ bool Rec2DVertex::checkQuality() const
 {
   double wQualAngle = .0, wQualEdge = .0;
   int weightAngle = 0, weightEdge = 0;
-  
+
   for (unsigned int i = 0; i < _elements.size(); ++i) {
     wQualAngle += _elements[i]->getWeightedAngleQual(this);
     weightAngle += _elements[i]->getAngleWeight();
@@ -4370,7 +4370,7 @@ bool Rec2DVertex::checkQuality() const
     wQualEdge += _edges[i]->getWeightedQual();
     weightEdge += _edges[i]->getWeight();
   }
-  
+
   if (wQualAngle < _sumWQualAngle - 1e12 ||
       wQualAngle > _sumWQualAngle + 1e12 ||
       weightAngle != _sumWeightAngle) {
@@ -4385,7 +4385,7 @@ bool Rec2DVertex::checkQuality() const
                _sumWQualEdge, _sumWeightEdge, wQualEdge, weightEdge);
     return false;
   }
-  
+
   return true;
 }
 
@@ -4433,7 +4433,7 @@ void Rec2DVertex::_updateQualAngle()
 {
   double oldQual1 = getQual(VertQuality);
   double oldQual2 = getQual(VertEdgeQuality);
-  
+
   _sumWQualAngle = .0;
   _sumWeightAngle = 0;
   for (unsigned int i = 0; i < _elements.size(); ++i) {
@@ -4441,7 +4441,7 @@ void Rec2DVertex::_updateQualAngle()
     _sumWQualAngle += _elements[i]->getWeightedAngleQual(this);
   }
   _lastUpdate = Recombine2D::getNumChange();
-  
+
   Rec2DData::updateVertQual(getQual(VertQuality)-oldQual1, VertQuality);
   Rec2DData::updateVertQual(getQual(VertEdgeQuality)-oldQual2, VertEdgeQuality);
 }
@@ -4466,7 +4466,7 @@ Rec2DElement::Rec2DElement(MTriangle *t, const Rec2DEdge **re, Rec2DVertex **rv)
     _elements[i] = Rec2DEdge::getTheOnlyElement(_edges[i]);
   _edges[3] = NULL;
   _elements[3] = NULL;
-  
+
   reveal(rv);
   if (!edgesAreInOrder(_edges, 3)) Msg::Error("tri |%d|", getNum());
 }
@@ -4478,7 +4478,7 @@ Rec2DElement::Rec2DElement(MQuadrangle *q, const Rec2DEdge **re, Rec2DVertex **r
     _edges[i] = (Rec2DEdge*)re[i];
   for (int i = 0; i < 4; ++i)
     _elements[i] = Rec2DEdge::getTheOnlyElement(_edges[i]);
-  
+
   reveal(rv);
   if (!edgesAreInOrder(_edges, 4)) Msg::Error("quad |%d|", getNum());
 }
@@ -4511,7 +4511,7 @@ void Rec2DElement::reveal(Rec2DVertex **rv)
     if (_elements[i])
       _elements[i]->addNeighbour(_edges[i], this);
   }
-  
+
   if (rv) {
     for (int i = 0; i < _numEdge; ++i)
       rv[i]->add(this);
@@ -4542,7 +4542,7 @@ void Rec2DElement::add(Rec2DEdge *re)
   }
   if (i == _numEdge)
     Msg::Error("[Rec2DElement] Already %d edges, can't add anymore", _numEdge);
-  
+
   if (_numEdge == 3)
     re->addHasTri();
 }
@@ -4582,7 +4582,7 @@ void Rec2DElement::addNeighbour(const Rec2DEdge *re, const Rec2DElement *rel)
       return;
     }
   }
-  
+
   Rec2DElement *elem[2];
   Rec2DEdge::getElements(re, elem);
   int a, b = a = 0;
@@ -4806,7 +4806,7 @@ double Rec2DElement::getAngle(const Rec2DVertex *rv) const
 {
   std::vector<Rec2DVertex*> vert;
   getVertices(vert);
-  
+
   int index = -1;
   for (int i = 0; i < _numEdge; ++i) {
     if (vert[i] == rv) {
@@ -4819,15 +4819,15 @@ double Rec2DElement::getAngle(const Rec2DVertex *rv) const
     Msg::Info("im %d, the vertex is %d", getNum(), rv->getNum());
     return -1.;
   }
-  
+
   int i1 = (index+_numEdge-1)%_numEdge;
   int i0 = (index+1)%_numEdge;
   double ang =  atan2(vert[i0]->v() - rv->v(), vert[i0]->u() - rv->u())
                 - atan2(vert[i1]->v() - rv->v(), vert[i1]->u() - rv->u());
-  
+
   static unsigned int a = 0;
   if (++a < 2) Msg::Warning("FIXME use real angle instead of parametric angle");
-  
+
   if (ang < .0)
     return ang + 2.*M_PI;
   return ang;
@@ -4893,14 +4893,14 @@ bool Rec2DElement::checkCoherence() const
     }
     return false;
   }
-  
+
   for (int i = 1; i < _numEdge; ++i) {
     for (int j = 0; j < i; ++j) {
       if (_edges[i] == _edges[j]) return false;
       if (v[i] == v[j]) return false;
     }
   }
-  
+
   for (int i = 0; i < _numEdge; ++i) {
     if (!v[i]->has(this)) {
       Msg::Error("vertex don't have me (im %d)", getNum());
@@ -4915,7 +4915,7 @@ bool Rec2DElement::checkCoherence() const
       return false;
     }
   }
-  
+
   if (Recombine2D::onlyRecombinations()) {
     if (_numEdge == 3) {
       if (_actions.size() == 1 && !Rec2DData::hasHasOneAction(this)) {
@@ -4955,10 +4955,10 @@ void Rec2DElement::print() const
 void Rec2DElement::createElement(double shiftx, double shifty) const
 {
   MVertex *mv[4];
-  
+
   std::vector<Rec2DVertex*> v;
   getVertices(v);
-  
+
   for (unsigned int i = 0; i < v.size(); ++i) {
     mv[i] = new MVertex(v[i]->getMVertex()->x() + shiftx,
                         v[i]->getMVertex()->y() + shifty,
@@ -5468,7 +5468,7 @@ namespace func {
       delete incompatibilities[i];
     }
   }
-  
+
   void findMaximumClique(std::vector<Ra2Incomp*> &truc)
   {
     if (truc.empty()) {
@@ -6040,13 +6040,13 @@ Rec2DNode::Rec2DNode(Rec2DNode *father, Rec2DAction *ra, int depth)
     Msg::Error("[Rec2DNode:constructor] Nothing to do");
     return;
   }
-  
+
   if (!father) Recombine2D::setNewTreeNode(this);
-  
+
   for (int i = 0; i < REC2D_NUMB_SONS; ++i)
     _son[i] = NULL;
   if (_ra) _ra->addPointing();
-  
+
   if (!depth) {
     _reward = _ra->getRealReward();
     if (Recombine2D::checkIfNotAllQuad()) {
@@ -6064,7 +6064,7 @@ Rec2DNode::Rec2DNode(Rec2DNode *father, Rec2DAction *ra, int depth)
     }
     return;
   }
-  
+
   // Apply changes
   std::vector<Rec2DElement*> savedNeighbours; // for Collapses
   if (_ra) {
@@ -6077,14 +6077,14 @@ Rec2DNode::Rec2DNode(Rec2DNode *father, Rec2DAction *ra, int depth)
     }
     _reward = Rec2DData::getGlobalQuality() - _globalQuality;
   }
-  
+
   // Create branches
   std::vector<Rec2DAction*> actions;
   Recombine2D::incNumChange();
   Recombine2D::nextTreeActions(actions, savedNeighbours, this);
   if (actions.empty() && depth < 0) Rec2DData::addEndNode(this);
   if (actions.size()) _createSons(actions, depth);
-  
+
   // Revert changes
   if (_dataChange) {
     if (!Rec2DData::revertDataChange(_dataChange))
@@ -6132,10 +6132,10 @@ void Rec2DNode::lookahead(int depth)
     // return a notAllQuad node
     return;
   }
-  
+
   _bestSeqReward = .0;
   _expectedSeqReward = .0;
-  
+
   if (_son[0]) {
     _depth = depth;
     _makeDevelopments(depth);
@@ -6163,13 +6163,13 @@ Rec2DNode* Rec2DNode::selectBestNode(Rec2DNode *rn)
     while (father) {
       if (!Rec2DData::revertDataChange(rn->_dataChange))
         Msg::Error(" 4 - don't reverted changes");
-      
+
       rn->_rmvFather(father);
       father->_rmvSon(rn);
       delete rn;
       rn = father;
       father = rn->_father;
-      
+
       if (!rn->_getNumSon()) rn->_notAllQuad = true;
       else {
 #ifdef DRAW_WHEN_SELECTED
@@ -6180,21 +6180,21 @@ Rec2DNode* Rec2DNode::selectBestNode(Rec2DNode *rn)
     }
     return NULL;
   }
-  
+
   if (!rn->_son[0])
     return NULL;
-  
+
 #ifdef DRAW_BEST_SEQ
   rn->_son[0]->printSequence();
 #endif
-  
+
   for (int i = 1; i < REC2D_NUMB_SONS; ++i) {
     rn->_delSons(false);
   }
   if (Recombine2D::dynamicTree()) {
     rn->_son[0]->_delSons(true);
   }
-  
+
   if (!rn->_son[0]->makeChanges()) Msg::Error("[Rec2DNode] No changes");
 
 #ifndef DRAW_BEST_SEQ
@@ -6202,10 +6202,10 @@ Rec2DNode* Rec2DNode::selectBestNode(Rec2DNode *rn)
     __draw(REC2D_WAIT_SELECTED);
 #endif
 #endif
-  
+
   static int a = 0;
   if (++a == 1) Msg::Warning("FIXME : if only recombines : can do all alone recombinations at beginning");
-  
+
   return rn->_son[0];
 }
 
@@ -6256,10 +6256,10 @@ bool Rec2DNode::canBeDeleted() const
 void Rec2DNode::printIdentity() const
 {
   Msg::Info("---- I am a node (n%d)", this);
-  
+
   if (_father)
     Msg::Info("     I have a father (n%d)", _father);
-  
+
   if (_ra) {
     Msg::Info("     My action is (ac%d)", _ra);
     _ra->printIdentity();
@@ -6286,14 +6286,14 @@ void Rec2DNode::_makeDevelopments(int depth)
 {
   if (Recombine2D::revertIfNotAllQuad() && _notAllQuad)
     Msg::Error("[Rec2DNode] Mais !");
-  
+
   int numSon = 0;
   while (numSon < REC2D_NUMB_SONS && _son[numSon]) ++numSon;
-  
+
   int i = 0, k2 = REC2D_NUMB_SONS;
   while (i < numSon) {
     _son[i]->_develop(depth-1);
-    
+
     if (Recombine2D::avoidIfNotAllQuad() && _son[i]->_isNotAllQuad()) {
       if (_son[--k2]) {
         Rec2DNode *tmp = _son[k2];
@@ -6318,7 +6318,7 @@ void Rec2DNode::_makeDevelopments(int depth)
       ++i;
     }
   }
-  
+
   if (numSon == 0) {
     _notAllQuad = true;
     if (!Recombine2D::revertIfNotAllQuad()) {
@@ -6331,7 +6331,7 @@ void Rec2DNode::_makeDevelopments(int depth)
       ++k2;
     }
   }
-  
+
   for (int j = k2; j < REC2D_NUMB_SONS; ++j) {
     _son[j]->_rmvFather(this);
     delete _son[j];
@@ -6345,7 +6345,7 @@ void Rec2DNode::_createSons(const std::vector<Rec2DAction*> &actions, int depth)
     Msg::Error("[Rec2DNode:_createSons] Nothing to do");
     return;
   }
-  
+
   Rec2DNode *tmpNode;
   int k1 = -1, k2 = REC2D_NUMB_SONS;
   for (unsigned int i = 0; i < actions.size(); ++i) {
@@ -6364,7 +6364,7 @@ void Rec2DNode::_createSons(const std::vector<Rec2DAction*> &actions, int depth)
       }
     }
   }
-  
+
   if (k1 < 0) {
     _notAllQuad = true;
     if (!Recombine2D::revertIfNotAllQuad()) {
@@ -6377,7 +6377,7 @@ void Rec2DNode::_createSons(const std::vector<Rec2DAction*> &actions, int depth)
       ++k2;
     }
   }
-  
+
   for (int i = k2; i < REC2D_NUMB_SONS; ++i) {
     _son[i]->_rmvFather(this);
     delete _son[i];
@@ -6397,14 +6397,14 @@ void Rec2DNode::_develop(int depth)
     return;
   }
   _depth = depth;
-  
+
   _bestSeqReward = .0;
   _expectedSeqReward = .0;
-  
+
   std::vector<Rec2DElement*> neighbours;
   if (!_son[0])
     _ra->getNeighbElemWithActions(neighbours);
-  
+
   bool hadAction = _createdActions;
   _dataChange = Rec2DData::getNewDataChange();
   _ra->apply(_dataChange, _createdActions);
@@ -6413,7 +6413,7 @@ void Rec2DNode::_develop(int depth)
       (*_createdActions)[i]->addPointing();
   }
   _reward = Rec2DData::getGlobalQuality() - _globalQuality;
-  
+
   if (_son[0]) _makeDevelopments(depth);
   else {
     std::vector<Rec2DAction*> actions;
@@ -6421,7 +6421,7 @@ void Rec2DNode::_develop(int depth)
     Recombine2D::nextTreeActions(actions, neighbours, this);
     if (actions.size()) _createSons(actions, depth);
   }
-  
+
   if (!Rec2DData::revertDataChange(_dataChange))
     Msg::Error(" 2 - don't reverted changes");
   else
@@ -6429,7 +6429,7 @@ void Rec2DNode::_develop(int depth)
   _dataChange = NULL;
 }
 
-int Rec2DNode::_getNumSon() const 
+int Rec2DNode::_getNumSon() const
 {
   int num = 0;
   for (int i = 0; i < REC2D_NUMB_SONS; ++i) {
@@ -6483,7 +6483,7 @@ bool Rec2DNode::_rmvSon(Rec2DNode *n)
 {
   int i = -1;
   while (++i < REC2D_NUMB_SONS && _son[i] != n);
-  
+
   if (i == REC2D_NUMB_SONS) {
     Msg::Info("im %d", this);
     for (int i = 0; i < REC2D_NUMB_SONS; ++i) {
diff --git a/Mesh/meshGFaceRecombine.h b/Mesh/meshGFaceRecombine.h
index 773bdd04bc..8add61012f 100644
--- a/Mesh/meshGFaceRecombine.h
+++ b/Mesh/meshGFaceRecombine.h
@@ -1,7 +1,7 @@
-// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Amaury Johnen (a.johnen@ulg.ac.be)
@@ -98,18 +98,18 @@ class Recombine2D {
     int _numChange;
     double _lastRunTime;
     Rec2DNode *_curNode;
-    
+
     // Parameter :
     const bool _collapses;
     int _strategy, _horizon;
     Rec2DQualCrit _qualCriterion;
-    
+
     bool _checkIfNotAllQuad; // Check if action implies triangle isolation
     bool _avoidIfNotAllQuad; // Don't apply action if it implies triangle isolation
     bool _revertIfNotAllQuad; // Be all quad at any price (can it be not totally unefficient ?)
     bool _oneActionHavePriority; // Tracks and prioritises elements with 1 action
     bool _noProblemIfObsolete; // For recombineSameAsHeuristic
-    
+
     int _weightEdgeBase;
     int _weightEdgeQuad;
     int _weightAngleTri;
@@ -118,24 +118,24 @@ class Recombine2D {
     float _coefDegreeQual;
     float _coefLengthQual;
     float _coefOrientQual;
-    
+
 #ifdef REC2D_RECO_BLOS
     bool _recombineWithBlossom;
     bool _saveBlossomMesh;
     int *elist;
     std::map<MElement*, int> t2n;
 #endif
-    
+
   public :
 
     static double t0, t1, t2, t3, t4, t5, t6, t7, t8, t9;
 
     Recombine2D(GFace*, bool collapses);
     ~Recombine2D();
-    
+
     // Construct data
     bool construct();
-    
+
     // Recombination methods
     bool recombine();
     bool recombineNewAlgo(int horiz = -1, int code = -1);
@@ -147,15 +147,15 @@ class Recombine2D {
     static void nextTreeActions(std::vector<Rec2DAction*>&,
                                 const std::vector<Rec2DElement*> &neighbours,
                                 const Rec2DNode *node = NULL);
-    
+
     // Revert recombinations
     void clearChanges();
-    
+
     // Save mesh & stats
     void updateMesh();
     void saveMesh(std::string);
     void saveStats(std::fstream*);
-    
+
     // Get/Set methods
     inline void setParamNewAlgo(int horiz, int code) {
       Rec2DAlgo::setParam(horiz, code);
@@ -171,7 +171,7 @@ class Recombine2D {
     static inline Rec2DQualCrit getQualCrit() {return _cur->_qualCriterion;}
     static inline void setNewTreeNode(Rec2DNode *rn) {_cur->_curNode = rn;}
     static inline double getTimeLastRun() {return _cur->_lastRunTime;}
-    
+
     // What is asked ?
     static inline bool dynamicTree() {return _cur->_strategy == 6;}
     static inline bool blossomRec() {return _cur->_recombineWithBlossom;}
@@ -184,7 +184,7 @@ class Recombine2D {
     static inline bool revertIfNotAllQuad() {return _cur->_revertIfNotAllQuad;}
     static inline bool priorityOfOneAction() {return _cur->_oneActionHavePriority;}
     static inline bool canIsolateTriangle() {return _cur->_noProblemIfObsolete;}
-    
+
     // Get/Set Weights
     static inline int getWeightEdgeBase() {return _cur->_weightEdgeBase;}
     static inline int getWeightEdgeQuad() {return _cur->_weightEdgeQuad;}
@@ -194,7 +194,7 @@ class Recombine2D {
     static inline void setWeightEdgeQuad(int a) {_cur->_weightEdgeQuad = a;}
     static inline void setWeightAngleTri(int a) {_cur->_weightAngleTri = a;}
     static inline void setWeightAngleQuad(int a) {_cur->_weightAngleQuad = a;}
-    
+
     // Get/Set Coefficients
     static inline float getCoefAngleQual() {return _cur->_coefAngleQual;}
     static inline float getCoefDegreeQual() {return _cur->_coefDegreeQual;}
@@ -210,7 +210,7 @@ class Recombine2D {
     static inline void setCoefDegreeQual(float f) {_cur->_coefDegreeQual = f;}
     static inline void setCoefLengthQual(float f) {_cur->_coefLengthQual = f;}
     static inline void setCoefOrientQual(float f) {_cur->_coefOrientQual = f;}
-    
+
     // Miscellaneous
     void compareWithBlossom();
     int computeQualBlossom() const;
@@ -225,15 +225,15 @@ class Recombine2D {
                                  const MElement *quad     );
     //
     static inline double angle2qual(double ang) {
-      return std::max(1. - fabs(ang*2./M_PI - 1.), .0); 
+      return std::max(1. - fabs(ang*2./M_PI - 1.), .0);
     }
-    
+
     // Debug
     void printState() const;
     void drawState(double shiftx, double shifty, bool color = false) const;
     static void drawStateCur(double dx, double dy) {_cur->drawState(dx, dy);}
     static void drawStateOrigin();
-    
+
   private :
     double _geomAngle(const MVertex*,
                       const std::vector<GEdge*>&,
@@ -262,16 +262,16 @@ class Rec2DData {
     struct lessAction {
       bool operator()(const Action*, const Action*) const;
     };
-    
+
   private :
     static Rec2DData *_cur;
-    
+
     long double _1valVert, _2valEdge, _2valVert;
     int _numVert, _numEdge;
 #ifdef REC2D_RECO_BLOS
     int _0blossomQuality;
 #endif
-    
+
     // Store entities
     std::vector<Rec2DEdge*> _edges;
     std::vector<Rec2DVertex*> _vertices;
@@ -292,39 +292,39 @@ class Rec2DData {
     std::vector<Rec2DAction*> _OActions;
     std::set<Rec2DAction*, gterRec2DAction> _sortedOActions; // if blossom !
 
-    
+
     // Store changes (so can revert)
     std::vector<Rec2DDataChange*> _changes;
-    
+
     // Store parities
     std::map<int, std::vector<Rec2DVertex*> > _parities;
     std::map<Rec2DVertex*, int> _oldParity;
-    
+
     // for Recombine2D::developTree(..)
     std::vector<Rec2DNode*> _endNodes;
-    
+
     // Useless Rec2DTwoTri2Quad are not deleted because Rec2DCollapse need them
     std::vector<Rec2DAction*> _hiddenActions;
-    
+
     // Track elements with one or zero actions
     std::set<Rec2DElement*> _elementWithOneAction;
     std::set<Rec2DElement*> _elementWithZeroAction;
-    
+
 #ifdef REC2D_RECO_BLOS
     std::map<MElement*, Rec2DElement*> _mel2rel;
 #endif
-  
+
   public :
 #if 1//def REC2D_DRAW
     std::vector<MTriangle*> _tri;
     std::vector<MQuadrangle*> _quad;
 #endif
-    
+
   public :
     Rec2DData();
     ~Rec2DData();
     static inline bool hasInstance() {return _cur;}
-    
+
     // Get/Set methods
     //static inline int getNumVert() {return _cur->_numVert;}
     //static inline int getNumEdge() {return _cur->_numEdge;}
@@ -336,7 +336,7 @@ class Rec2DData {
     static inline int getBlosQual() {return _cur->_0blossomQuality;}
 #endif
     static inline unsigned int getNumElements() {return _cur->_elements.size();}
-    
+
     // Add/Remove Entities
     static void add(const Rec2DEdge*);
     static void add(const Rec2DVertex*);
@@ -344,7 +344,7 @@ class Rec2DData {
     static void rmv(const Rec2DEdge*);
     static void rmv(const Rec2DVertex*);
     static void rmv(const Rec2DElement*);
-    
+
     // Entities iterators
     typedef std::vector<Rec2DEdge*>::iterator iter_re;
     typedef std::vector<Rec2DVertex*>::iterator iter_rv;
@@ -355,7 +355,7 @@ class Rec2DData {
     static inline iter_re lastEdge() {return _cur->_edges.end();}
     static inline iter_rv lastVertex() {return _cur->_vertices.end();}
     static inline iter_rel lastElement() {return _cur->_elements.end();}
-    
+
     // Operators on Actions
     static void add(const Rec2DAction*);
     static void rmv(const Rec2DAction*);
@@ -365,13 +365,13 @@ class Rec2DData {
     }
     static inline bool hasAction() {return _cur->_actions.size();}
     static inline int getNumAction() {return _cur->_actions.size();}
-    // 
+    //
     static Rec2DAction* getBestAction();
     static Rec2DAction* getRandomAction();
     //inline void sortActions() {sort(_actions.begin(), _actions.end(), gterAction());}
     //
     static void checkObsolete();
-    
+
     // Operators on One & Zero Actions
     static void addHasZeroAction(const Rec2DElement*);
     static void rmvHasZeroAction(const Rec2DElement*);
@@ -384,7 +384,7 @@ class Rec2DData {
     static void getElementsOneAction(std::vector<Rec2DElement*> &vec);
     static Rec2DAction* getOneAction();
     static void getUniqueOneActions(std::vector<Rec2DAction*>&);
-    
+
     // Process parities
     static int getNewParity();
     static void removeParity(const Rec2DVertex*, int);
@@ -392,13 +392,13 @@ class Rec2DData {
       _cur->_parities[p].push_back((Rec2DVertex*)rv);
     }
     static void associateParity(int pOld, int pNew, Rec2DDataChange *rdc = NULL);
-    
+
     // Process DataChange objects
     static Rec2DDataChange* getNewDataChange();
     static bool revertDataChange(Rec2DDataChange*);
     static void clearChanges();
     static inline int getNumChanges() {return _cur->_changes.size();}
-    
+
     // Quality
     static double getGlobalQuality(Rec2DQualCrit c = ChoosedCrit);
     static double getGlobalQuality(int numVert, double valVert,
@@ -412,28 +412,28 @@ class Rec2DData {
 #ifdef REC2D_RECO_BLOS
     static inline void addBlosQual(int val) {_cur->_0blossomQuality += val;}
 #endif
-    
+
     // Check errors
     static bool checkEntities();
     void checkQuality() const;
-    
+
     // Print state / Draw actions
     void printState() const;
     void printActions() const;
     static void printAction() {_cur->printAction();}
-    
+
     // Draw methods
     void drawTriangles(double shiftx, double shifty) const;
     void drawElements(double shiftx, double shifty) const;
     void drawChanges(double shiftx, double shifty, bool color) const;
-    
+
     // Operators on End Nodes
     static void addEndNode(const Rec2DNode*);
     static void sortEndNode();
     static inline void drawEndNode(int num);
     static inline int getNumEndNode() {return _cur->_endNodes.size();}
     static inline int getNumElement() {return _cur->_elements.size();}
-    
+
     // Miscellaneous
     static void copyElements(std::vector<Rec2DElement*> &v) {
       v = _cur->_elements;
@@ -464,11 +464,11 @@ enum Rec2DChangeType {
 };
 
 class Rec2DChange {
-  private : 
+  private :
     Rec2DChangeType _type;
     void *_entity;
     void *_info;
-  
+
   public :
     Rec2DChange() {Msg::Fatal("[Rec2DChange] I should not be created in this manner");}
     Rec2DChange(int);
@@ -495,7 +495,7 @@ class Rec2DChange {
     Rec2DChange(Rec2DEdge*, Rec2DEdge*,
                 const std::vector<Rec2DAction*>&,
                 Rec2DChangeType                  ); // swap edge1 to edge2 (action)
-    
+
     void getHiddenActions(std::set<Rec2DAction*>&);
 
     void revert();
@@ -505,14 +505,14 @@ class Rec2DDataChange {
   private :
     std::vector<Rec2DChange*> _changes;
     Rec2DAction *_ra;
-    
+
   public :
     ~Rec2DDataChange();
-    
+
     inline void add(int a) {_changes.push_back(new Rec2DChange(a));}
-    
+
     inline void hide(Rec2DEdge *re) {_changes.push_back(new Rec2DChange(re, 1));}
-    inline void hide(Rec2DVertex *rv) {_changes.push_back(new Rec2DChange(rv, 1));} 
+    inline void hide(Rec2DVertex *rv) {_changes.push_back(new Rec2DChange(rv, 1));}
     inline void hide(Rec2DElement *rel) {_changes.push_back(new Rec2DChange(rel, 1));}
     std::vector<Rec2DAction*> hiddenActions;
     inline void hide(Rec2DAction *ra) {
@@ -526,10 +526,10 @@ class Rec2DDataChange {
 
     inline void append(Rec2DElement *rel) {_changes.push_back(new Rec2DChange(rel));}
     inline void append(Rec2DAction *ra) {_changes.push_back(new Rec2DChange(ra));}
-    
+
     void swapFor(Rec2DEdge*, Rec2DEdge*);
     void swapFor(Rec2DVertex*, Rec2DVertex*);
-    
+
     inline void relocate(Rec2DVertex *rv, const SPoint2 &p) {
       _changes.push_back(new Rec2DChange(rv, p));
     }
@@ -541,11 +541,11 @@ class Rec2DDataChange {
     }
 
     void checkObsoleteActions(Rec2DVertex*const*, int size);
-    
+
     void getHiddenActions(std::set<Rec2DAction*>&);
 
     void revert();
-    
+
     void setAction(const Rec2DAction *action) {_ra = (Rec2DAction*)action;}
     Rec2DAction* getAction() const {return _ra;}
 };
@@ -556,40 +556,40 @@ class Rec2DAction {
     double _globQualIfExecuted, _reward;
     int _lastUpdate, _numPointing;
     void *_dataAction; // Rec2DData::Action*
-    
+
     friend void Rec2DData::add(const Rec2DAction*);
     friend void Rec2DData::rmv(const Rec2DAction*);
     friend bool Rec2DData::has(const Rec2DAction *ra);
     friend void Rec2DData::Action::update();
-    
+
   public :
     Rec2DAction();
     virtual ~Rec2DAction() {}
     virtual void hide() = 0;
     virtual void reveal() = 0;
-    
+
     // Get methods
     virtual bool isRecomb() const = 0;
-    
+
     // Quality
     double getReward() const;
     double getRealReward() const;
     bool operator<(const Rec2DAction&) const;
-    
+
     // Application
     virtual bool isObsolete() const = 0;
     virtual void apply(std::vector<Rec2DVertex*> &newPar) = 0;
     virtual void apply(Rec2DDataChange*, std::vector<Rec2DAction*>*&,
                        bool color = false) const = 0;
-    
+
     // Swap
     virtual void swap(Rec2DVertex*, Rec2DVertex*) = 0;
     virtual void swap(Rec2DEdge*, Rec2DEdge*) = 0;
-    
+
     // Pointing
     inline void addPointing() {++_numPointing;}
     inline void rmvPointing() {--_numPointing;}
-    
+
     // Get Element methods
     virtual bool has(const Rec2DElement*) const = 0;
     virtual bool haveElem() const = 0;
@@ -600,21 +600,21 @@ class Rec2DAction {
     virtual void getNeighbourElements(std::vector<Rec2DElement*>&) const = 0;
     virtual void getNeighbElemWithActions(std::vector<Rec2DElement*>&) const = 0;
     virtual void getTouchedActions(std::vector<Rec2DAction*>&) const = 0;
-    
+
     // Get Vertex methods
     virtual Rec2DVertex* getVertex(int) const = 0;
-    
+
     // Check errors
     virtual bool checkCoherence(const Rec2DAction *ra = NULL) const = 0;
     inline void *getDataAction() const {return _dataAction;}
-    
+
     // Debug
     virtual void printAdress() = 0;
     virtual void printReward() const = 0;
     virtual void printTypeRew() const = 0;
     virtual void printVertices() const = 0;
     virtual void printIdentity() const = 0;
-    
+
     // Miscellaneous
     virtual Rec2DAction* getBase() const = 0;
     virtual Rec2DAction* getInfant() const = 0;
@@ -623,7 +623,7 @@ class Rec2DAction {
     virtual void getIncompatible(std::vector<Rec2DAction*>&) = 0;
     //
     static void removeDuplicate(std::vector<Rec2DAction*>&);
-    
+
   private :
     virtual void _computeGlobQual() = 0;
     virtual void _computeReward() = 0;
@@ -636,33 +636,33 @@ class Rec2DTwoTri2Quad : public Rec2DAction {
     Rec2DVertex *_vertices[4]; // 4 boundary (2 on embedded edge + 2)
     Rec2DCollapse *_col;
     double _valVert;
-    
+
 #ifdef REC2D_RECO_BLOS
     RecombineTriangle *_rt;
 #endif
 
     friend class Rec2DCollapse;
-    
+
   public :
     Rec2DTwoTri2Quad(Rec2DElement*, Rec2DElement*);
     ~Rec2DTwoTri2Quad() {}
     void operator delete(void*);
     virtual void hide();
     virtual void reveal();
-    
+
     // Get methods
     inline bool isRecomb() const {return true;}
-    
+
     // Application
     virtual bool isObsolete() const;
     virtual void apply(std::vector<Rec2DVertex*> &newPar);
     virtual void apply(Rec2DDataChange*, std::vector<Rec2DAction*>*&,
                        bool color = false) const;
-    
+
     // Swap
     virtual void swap(Rec2DVertex*, Rec2DVertex*);
     virtual void swap(Rec2DEdge*, Rec2DEdge*);
-    
+
     // Get Element methods
     virtual bool has(const Rec2DElement*) const;
     virtual inline bool haveElem() const {return true;}
@@ -673,27 +673,27 @@ class Rec2DTwoTri2Quad : public Rec2DAction {
     virtual void getNeighbourElements(std::vector<Rec2DElement*>&) const;
     virtual void getNeighbElemWithActions(std::vector<Rec2DElement*>&) const;
     virtual void getTouchedActions(std::vector<Rec2DAction*>&) const;
-    
+
     // Get Vertex methods
     virtual inline Rec2DVertex* getVertex(int i) const {return _vertices[i];} //-
-    
+
     // Check errors
     virtual bool checkCoherence(const Rec2DAction *ra = NULL) const;
-    
+
     // Debug
     virtual inline void printAdress() {Msg::Info(" %d", this);}
     virtual void printReward() const;
     virtual inline void printTypeRew() const {Msg::Info("Recombine %g", _globQualIfExecuted);}
     virtual void printVertices() const;
     virtual void printIdentity() const;
-    
+
     // Miscellaneous
     virtual inline Rec2DAction* getBase() const {return NULL;}
     virtual inline Rec2DAction* getInfant() const {return (Rec2DAction*)_col;}
     virtual MElement* createMElement(double shiftx, double shifty);
     virtual void color(int, int, int) const;
     virtual void getIncompatible(std::vector<Rec2DAction*>&);
-    
+
   private :
     virtual void _computeGlobQual();
     virtual void _computeReward();
@@ -703,27 +703,27 @@ class Rec2DTwoTri2Quad : public Rec2DAction {
 class Rec2DCollapse : public Rec2DAction {
   private :
     Rec2DTwoTri2Quad *_rec;
-    
+
   public :
     Rec2DCollapse(Rec2DTwoTri2Quad*);
     ~Rec2DCollapse() {}
     void operator delete(void*);
     virtual void hide();
     virtual void reveal();
-    
+
     // Get methods
     inline bool isRecomb() const {return false;}
-    
+
     // Application
     virtual bool isObsolete() const;
     virtual void apply(std::vector<Rec2DVertex*> &newPar);
     virtual void apply(Rec2DDataChange*, std::vector<Rec2DAction*>*&,
                        bool color = false) const;
-    
+
     // Swap
     virtual inline void swap(Rec2DVertex *rv0, Rec2DVertex *rv1) {_rec->swap(rv0, rv1);}
     virtual inline void swap(Rec2DEdge *re0, Rec2DEdge *re1) {_rec->swap(re0, re1);}
-    
+
     // Get Element methods
     virtual inline bool has(const Rec2DElement *rel) const {return _rec->has(rel);}
     virtual inline bool haveElem() const {return false;}
@@ -738,31 +738,31 @@ class Rec2DCollapse : public Rec2DAction {
     virtual void getNeighbourElements(std::vector<Rec2DElement*> &) const;
     virtual void getNeighbElemWithActions(std::vector<Rec2DElement*> &) const;
     virtual void getTouchedActions(std::vector<Rec2DAction*>&) const {}
-    
+
     // Get Vertex methods
     virtual inline Rec2DVertex* getVertex(int i) const {
       return _rec->getVertex(i);
     }
-    
+
     // Check errors
     virtual inline bool checkCoherence(const Rec2DAction *ra = NULL) const {
       return _rec->checkCoherence(this);
     }
-    
+
     // Debug
     virtual inline void printAdress() {_rec->printAdress();}
     virtual void printReward() const;
     virtual inline void printTypeRew() const {Msg::Info("Collapse %g", _globQualIfExecuted);}
     virtual inline void printVertices() const {_rec->printVertices();}
     virtual void printIdentity() const;
-    
+
     // Miscellaneous
     virtual inline Rec2DAction* getBase() const {return _rec;}
     virtual inline Rec2DAction* getInfant() const {return NULL;}
     virtual inline MElement* createMElement(double shiftx, double shifty) {return NULL;}
     virtual inline void color(int c1, int c2, int c3) const {_rec->color(c1, c2, c3);}
     virtual void getIncompatible(std::vector<Rec2DAction*>&) {Msg::Fatal("not implemented");};
-    
+
   private :
     virtual void _computeGlobQual();
     virtual void _computeReward();
@@ -775,48 +775,48 @@ class Rec2DEdge {
     Rec2DVertex *_rv0, *_rv1;
     double _qual;
     int _weight;
-    int _lastUpdate; 
-    
+    int _lastUpdate;
+
     int _pos; // For quick add and remove in Rec2DData
     friend void Rec2DData::add(const Rec2DEdge*);
     friend void Rec2DData::rmv(const Rec2DEdge*);
-    
+
   public :
     Rec2DEdge(Rec2DVertex*, Rec2DVertex*);
     ~Rec2DEdge() {if (_pos > -1) hide();}
     void hide();
     void reveal();
-    
+
     // Get Vertex methods
     inline bool has(const Rec2DVertex *v) const {return v == _rv0 || v == _rv1;}
     inline Rec2DVertex* getVertex(int i) const {if (i) return _rv1; return _rv0;}
     Rec2DVertex* getOtherVertex(const Rec2DVertex*) const;
-    
+
     // Get Element methods
     static Rec2DElement* getTheOnlyElement(const Rec2DEdge*);
     static void getElements(const Rec2DEdge*, Rec2DElement**);
-    
+
     // Get Action methods
     //void getUniqueActions(std::vector<Rec2DAction*>&) const;
-    
+
     // Quality
     inline double getQual() const {return _qual;}
     inline int getWeight() const {return _weight;}
     inline double getWeightedQual() const {return _weight * _qual;}
     void updateQual();
-    
+
     // Miscellaneous
     inline bool isOnBoundary() const;
     inline void addHasTri() {_addWeight(-Recombine2D::getWeightEdgeQuad());}
     inline void remHasTri() {_addWeight(Recombine2D::getWeightEdgeQuad());}
     void swap(Rec2DVertex *oldRV, Rec2DVertex *newRV, bool upVert = true);
-    
+
     // Check errors
     bool checkCoherence() const;
-    
+
     // Debug
     void print() const;
-    
+
   private :
     void _computeQual();
     void _addWeight(int);
@@ -828,8 +828,8 @@ struct AngleData {
   std::vector<GEdge*> _gEdges;
   std::vector<MElement*> _mElements;
   Rec2DVertex *_rv;
-  
-  AngleData() : _rv(NULL) {} 
+
+  AngleData() : _rv(NULL) {}
 };
 
 class Rec2DVertex {
@@ -838,10 +838,10 @@ class Rec2DVertex {
     const double _angle;
     int _onWhat; // _onWhat={-1:corner,0:edge,1:face}
     int _parity, _lastUpdate;
-    
+
     double _sumWQualAngle, _sumWQualEdge;
     int _sumWeightAngle, _sumWeightEdge;
-    
+
     std::vector<Rec2DEdge*> _edges;
     std::vector<Rec2DElement*> _elements;
     SPoint2 _param;
@@ -849,20 +849,20 @@ class Rec2DVertex {
     int _pos; // For quick add and remove in Rec2DData
     friend void Rec2DData::add(const Rec2DVertex*);
     friend void Rec2DData::rmv(const Rec2DVertex*);
-    
+
     static double **_qualVSnum;
     static double **_gains;
-    
+
   public :
     Rec2DVertex(MVertex*);
     Rec2DVertex(Rec2DVertex*, double angle);
     ~Rec2DVertex() {if (_pos > -1) hide();}
     void hide(bool check = true);
     void reveal();
-    
+
     // Initialize topo qual table
     static void initStaticTable();
-    
+
     // Get methods
     inline double u() const {return _param[0];}
     inline double v() const {return _param[1];}
@@ -875,44 +875,44 @@ class Rec2DVertex {
     inline double getGeomAngle() const {return _angle;}
     inline int getLastUpdate() const {return _lastUpdate;}
     inline MVertex* getMVertex() const {return _v;}
-    
+
     // Add/Remove Edges
     void add(const Rec2DEdge*);
     bool has(const Rec2DEdge*) const;
     void rmv(const Rec2DEdge*);
-    
+
     // Add/Remove Elements
     void add(const Rec2DElement*);
     bool has(const Rec2DElement*) const;
     void rmv(const Rec2DElement*);
-    
+
     // Get Edge methods
     inline void getEdges(std::vector<Rec2DEdge*> &v) const {v = _edges;}
     void getMoreUniqueEdges(std::vector<Rec2DEdge*>&) const;
     static Rec2DEdge* getCommonEdge(const Rec2DVertex*, const Rec2DVertex*);
-    
+
     // Get Vertex methods
     void getMoreNeighbourVertices(std::vector<Rec2DVertex*>&) const;
-    
+
     // Get Element methods
     inline int getNumElements() const {return _elements.size();}
     inline void getElements(std::vector<Rec2DElement*> &v) const {v = _elements;}
     static void getCommonElements(const Rec2DVertex*, const Rec2DVertex*,
                                   std::vector<Rec2DElement*>&            );
-    
+
     // Get Action methods
     void getMoreUniqueActions(std::vector<Rec2DAction*>&) const;
-    
+
     // Get/Set on boundary
     inline void setOnBoundary();
     inline bool getOnBoundary() const {return _onWhat < 1;}
-    
+
     // Get/Set parity
     inline int getParity() const {return _parity;}
     void setParity(int, bool tree = false);
     void setParityWD(int pOld, int pNew);
     bool setBoundaryParity(int p0, int p1);
-    
+
     // Quality
     double getQualDegree(int numEl = -1) const;
     double getGainDegree(int) const;
@@ -935,7 +935,7 @@ class Rec2DVertex {
     double getGainMerge(const Rec2DVertex*, const Rec2DEdge*const*, int) const;
     double getGainOneElemLess() const;
     double getGainMerge(const Rec2DVertex*) const;
-    
+
     double getQual(Rec2DQualCrit crit = ChoosedCrit) const;
     double getQual(double waQualAngles, double waQualEdges, int numElem,
                    Rec2DQualCrit c = ChoosedCrit) const;
@@ -946,25 +946,25 @@ class Rec2DVertex {
                          const Rec2DEdge *adjacent2 = NULL) const;
 #endif
     void updateWAQualEdges(double d, int a = 0);
-    
+
     // Miscellaneous
     void relocate(SPoint2 p);
     inline int getNum() const {return _v->getNum();}
-    
+
     // Check errors
     bool checkCoherence() const;
     bool checkQuality() const;
-    
+
     // Debug
     void printElem() const;
     void printQual() const;
-    
+
   private :
     //inline double _getQualAngle() const {return _sumQualAngle/_elements.size();}
     bool _recursiveBoundParity(const Rec2DVertex *prev, int p0, int p1);
     void _updateQualAngle();
     //inline double _angle2Qual(double ang) const {
-    //  return std::max(1. - fabs(ang*2./M_PI - 1.), .0); 
+    //  return std::max(1. - fabs(ang*2./M_PI - 1.), .0);
     // }
     double _qualDegree(int numEl = -1) const;
     inline double _WAQualAngles() const {return _sumWQualAngle / _sumWeightAngle;}
@@ -992,61 +992,61 @@ class Rec2DElement {
     Rec2DEdge *_edges[4];
     Rec2DElement *_elements[4]; // NULL if no neighbour
     std::vector<Rec2DAction*> _actions;
-    
+
     int _pos; // For quick add and remove in Rec2DData
     friend void Rec2DData::add(const Rec2DElement*);
     friend void Rec2DData::rmv(const Rec2DElement*);
-    
+
   public :
     Rec2DElement(MTriangle*, const Rec2DEdge**, Rec2DVertex **rv = NULL);
     Rec2DElement(MQuadrangle*, const Rec2DEdge**, Rec2DVertex **rv = NULL);
     ~Rec2DElement() {if (_pos > -1) hide();}
     void hide();
     void reveal(Rec2DVertex **rv = NULL);
-    
+
     // Add/Remove Edges
     void add(Rec2DEdge*);
     bool has(const Rec2DEdge*) const;
-    
+
     // Has Vertex/Element
     bool has(const Rec2DVertex*) const;
     bool has(const Rec2DElement*) const;
-    
+
     // Add/Remove neighbour Elements
     void addNeighbour(const Rec2DEdge*, const Rec2DElement*);
     void rmvNeighbour(const Rec2DEdge*, const Rec2DElement*);
     bool isNeighbour(const Rec2DEdge*, const Rec2DElement*) const;
-    
+
     // Add/Remove Actions
     void add(const Rec2DAction*);
     void rmv(const Rec2DAction*);
     bool has(const Rec2DAction*) const;
-    
+
     // Get Edge methods
     inline void getMoreEdges(std::vector<Rec2DEdge*> &v) const {
       v.insert(v.end(), _edges, _edges + _numEdge);
     }
     static Rec2DEdge* getCommonEdge(const Rec2DElement*, const Rec2DElement*);
-    
+
     // Get Vertex methods
     void getVertices(std::vector<Rec2DVertex*>&) const;
     Rec2DVertex* getOtherVertex(const Rec2DVertex*, const Rec2DVertex*) const;
-    
+
     // Get Element methods
     void getMoreNeighbours(std::vector<Rec2DElement*>&) const;
     //static void getElements(const Rec2DEdge*, Rec2DElement**);
-    
+
     // Get Action methods
     inline int getNumActions() const {return _actions.size();}
     inline Rec2DAction* getAction(int i) const {return _actions[i];}
     inline void getActions(std::vector<Rec2DAction*> &v) const {v = _actions;};
     void getMoreUniqueActions(std::vector<Rec2DAction*>&) const;
     void getMoreUniqueActions(std::set<Rec2DAction*, gterRec2DAction>&) const;
-    
+
     // Swap
     void swap(Rec2DEdge*, Rec2DEdge*);
     void swapMVertex(Rec2DVertex*, Rec2DVertex*);
-    
+
     // Quality
     inline int getAngleWeight() const {
       return _numEdge > 3 ? Recombine2D::getWeightAngleQuad() : Recombine2D::getWeightAngleTri();
@@ -1058,7 +1058,7 @@ class Rec2DElement {
     inline double getWeightedAngleQual(const Rec2DVertex *v) const {
       return getAngleWeight() * getAngleQual(v);
     }
-    
+
     // Miscellaneous
     inline int getNum() const {return _mEl->getNum();}
     inline bool isTri() const {return _numEdge == 3;}
@@ -1084,14 +1084,14 @@ class Rec2DElement {
       return NULL;
     }
 #endif
-    
+
     // Check errors
     bool checkCoherence() const;
-    
+
     // Debug
     void print() const;
     void createElement(double shiftx, double shifty) const;
-    
+
   private :
     MQuadrangle* _createQuad() const;
 };
@@ -1242,26 +1242,26 @@ class Rec2DNode {
     // seq = from son to end of horizon/tree
     double _reward, _globalQuality, _bestSeqReward, _expectedSeqReward;
     std::vector<Rec2DAction*> *_createdActions;
-    
+
     bool _notAllQuad; // For only recombinations
-    
+
   public :
     Rec2DNode(Rec2DNode *father, Rec2DAction*, int depth = -1);
     ~Rec2DNode();
-    
+
     // Get methods
     inline double getReward() const {return _reward;}
     inline Rec2DAction* getAction() const {return _ra;}
     inline Rec2DNode* getFather() const {return _father;}
-    
+
     // Process the tree
     void lookahead(int depth);
     static Rec2DNode* selectBestNode(Rec2DNode*);
-    
+
     // Make/Revert changes
     bool makeChanges();
     bool revertChanges();
-    
+
     // Miscellaneous
     bool operator<(Rec2DNode&);
     bool canBeDeleted() const;
@@ -1269,7 +1269,7 @@ class Rec2DNode {
     inline bool notInSubTree() const {return hasOneSon() && _son[0]->_depth == _depth;}
     inline bool hasOneSon() const {return _son[0] && !_son[1];}
     inline Rec2DNode* getSon() const {return _son[0];}
-    
+
     // Debug
     void draw(double dx, double dy) {
       if (_father)
@@ -1282,13 +1282,13 @@ class Rec2DNode {
     }
     void printIdentity() const;
     void printSequence() const;
-    
+
   private:
     // Process the tree
     void _makeDevelopments(int depth);
     void _createSons(const std::vector<Rec2DAction*>&, int depth);
     void _develop(int depth);
-    
+
     // Operators on Sons
     inline bool _hasSons() const {return _son[0];}
     /*bool _hasSon(Rec2DNode *n) {
@@ -1301,15 +1301,15 @@ class Rec2DNode {
     void _delSons(bool alsoFirst);
     void _orderSons();
     bool _rmvSon(Rec2DNode *n);
-    
+
     // Operators on Father
     void _rmvFather(Rec2DNode *n);
-    
+
     // Reward
     inline double _getExpectedSeqReward() {return _reward + _expectedSeqReward;}
     inline double _getBestSequenceReward() {return _reward + _bestSeqReward;}
     inline double _getGlobQual() const {return _globalQuality + _reward;}
-    
+
     // Miscellaneous
     void _mkChgSinceBeginning() {
       if (_father)
@@ -1326,55 +1326,3 @@ class Rec2DNode {
 };
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Mesh/meshGFaceTransfinite.cpp b/Mesh/meshGFaceTransfinite.cpp
index f31f99bb13..0b03844077 100644
--- a/Mesh/meshGFaceTransfinite.cpp
+++ b/Mesh/meshGFaceTransfinite.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <map>
 #include "meshGFace.h"
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index 5373572421..ca00240b66 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <vector>
diff --git a/Mesh/meshGRegion.h b/Mesh/meshGRegion.h
index f514df0dd5..25f12794bf 100644
--- a/Mesh/meshGRegion.h
+++ b/Mesh/meshGRegion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GREGION_H_
 #define _MESH_GREGION_H_
diff --git a/Mesh/meshGRegion19036.cpp b/Mesh/meshGRegion19036.cpp
index 24327daca3..bbf6ba0308 100644
--- a/Mesh/meshGRegion19036.cpp
+++ b/Mesh/meshGRegion19036.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <vector>
diff --git a/Mesh/meshGRegionBoundaryRecovery.cpp b/Mesh/meshGRegionBoundaryRecovery.cpp
index c13f8c033f..7edb97b04a 100644
--- a/Mesh/meshGRegionBoundaryRecovery.cpp
+++ b/Mesh/meshGRegionBoundaryRecovery.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Hang Si
 
diff --git a/Mesh/meshGRegionBoundaryRecovery.h b/Mesh/meshGRegionBoundaryRecovery.h
index 4544cf5927..0023617e71 100644
--- a/Mesh/meshGRegionBoundaryRecovery.h
+++ b/Mesh/meshGRegionBoundaryRecovery.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GREGION_BOUNDARY_RECOVERY_H_
 #define _MESH_GREGION_BOUNDARY_RECOVERY_H_
diff --git a/Mesh/meshGRegionCarveHole.cpp b/Mesh/meshGRegionCarveHole.cpp
index cbf47d2014..1e75027720 100644
--- a/Mesh/meshGRegionCarveHole.cpp
+++ b/Mesh/meshGRegionCarveHole.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "GmshConfig.h"
diff --git a/Mesh/meshGRegionDelaunayInsertion.cpp b/Mesh/meshGRegionDelaunayInsertion.cpp
index 6e37e26a5f..3014ccefb8 100644
--- a/Mesh/meshGRegionDelaunayInsertion.cpp
+++ b/Mesh/meshGRegionDelaunayInsertion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include <map>
diff --git a/Mesh/meshGRegionDelaunayInsertion.h b/Mesh/meshGRegionDelaunayInsertion.h
index 4ca146d29d..88af9966f4 100644
--- a/Mesh/meshGRegionDelaunayInsertion.h
+++ b/Mesh/meshGRegionDelaunayInsertion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GREGION_DELAUNAY_INSERTION_H_
 #define _MESH_GREGION_DELAUNAY_INSERTION_H_
diff --git a/Mesh/meshGRegionExtruded.cpp b/Mesh/meshGRegionExtruded.cpp
index 4203479544..e64ee51ef4 100644
--- a/Mesh/meshGRegionExtruded.cpp
+++ b/Mesh/meshGRegionExtruded.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "GModel.h"
diff --git a/Mesh/meshGRegionLocalMeshMod.cpp b/Mesh/meshGRegionLocalMeshMod.cpp
index adb2c32ca7..9c40a8f0f0 100644
--- a/Mesh/meshGRegionLocalMeshMod.cpp
+++ b/Mesh/meshGRegionLocalMeshMod.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "meshGRegionLocalMeshMod.h"
 #include "GEntity.h"
diff --git a/Mesh/meshGRegionLocalMeshMod.h b/Mesh/meshGRegionLocalMeshMod.h
index 323b1b30b2..53f02b481d 100644
--- a/Mesh/meshGRegionLocalMeshMod.h
+++ b/Mesh/meshGRegionLocalMeshMod.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_GREGION_LOCAL_MESH_MOD_H_
 #define _MESH_GREGION_LOCAL_MESH_MOD_H_
diff --git a/Mesh/meshGRegionMMG3D.cpp b/Mesh/meshGRegionMMG3D.cpp
index 114351bb35..01c62fb97e 100644
--- a/Mesh/meshGRegionMMG3D.cpp
+++ b/Mesh/meshGRegionMMG3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Mesh/meshGRegionMMG3D.h b/Mesh/meshGRegionMMG3D.h
index 08d598c18d..e13258d7ef 100644
--- a/Mesh/meshGRegionMMG3D.h
+++ b/Mesh/meshGRegionMMG3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESHGREGIONMMG3D_H_
 #define _MESHGREGIONMMG3D_H_
diff --git a/Mesh/meshGRegionTransfinite.cpp b/Mesh/meshGRegionTransfinite.cpp
index c71092d3a0..2e263e6cf2 100644
--- a/Mesh/meshGRegionTransfinite.cpp
+++ b/Mesh/meshGRegionTransfinite.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Trevor S. Strickler
diff --git a/Mesh/meshMetric.cpp b/Mesh/meshMetric.cpp
index 4e05d87fcb..2381a85d87 100644
--- a/Mesh/meshMetric.cpp
+++ b/Mesh/meshMetric.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "meshMetric.h"
 #include "meshGFaceOptimize.h"
diff --git a/Mesh/meshMetric.h b/Mesh/meshMetric.h
index 5a732022da..82918aa88c 100644
--- a/Mesh/meshMetric.h
+++ b/Mesh/meshMetric.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_METRIC_H_
 #define _MESH_METRIC_H_
diff --git a/Mesh/meshPartition.cpp b/Mesh/meshPartition.cpp
index 94f143a679..5f0cd21d56 100644
--- a/Mesh/meshPartition.cpp
+++ b/Mesh/meshPartition.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Partition.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
diff --git a/Mesh/meshPartition.h b/Mesh/meshPartition.h
index e8b1c14d76..4bffa008e2 100644
--- a/Mesh/meshPartition.h
+++ b/Mesh/meshPartition.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_PARTITION_H_
 #define _MESH_PARTITION_H_
diff --git a/Mesh/meshPartitionObjects.h b/Mesh/meshPartitionObjects.h
index 059447bcbd..f73c77c850 100644
--- a/Mesh/meshPartitionObjects.h
+++ b/Mesh/meshPartitionObjects.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_PARTITION_OBJECTS_H_
 #define _MESH_PARTITION_OBJECTS_H_
diff --git a/Mesh/meshPartitionOptions.h b/Mesh/meshPartitionOptions.h
index 7ec609e7af..134a2e4736 100644
--- a/Mesh/meshPartitionOptions.h
+++ b/Mesh/meshPartitionOptions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_PARTITION_OPTIONS_H_
 #define _MESH_PARTITION_OPTIONS_H_
diff --git a/Mesh/meshRecombine2D.cpp b/Mesh/meshRecombine2D.cpp
index 244a8fc4ac..6df5959ff2 100644
--- a/Mesh/meshRecombine2D.cpp
+++ b/Mesh/meshRecombine2D.cpp
@@ -1,7 +1,7 @@
-// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Amaury Johnen, adapted from meshGFaceOptimize
diff --git a/Mesh/meshRecombine2D_2.cpp b/Mesh/meshRecombine2D_2.cpp
index 6fe83b6c37..20abf42083 100644
--- a/Mesh/meshRecombine2D_2.cpp
+++ b/Mesh/meshRecombine2D_2.cpp
@@ -1,7 +1,7 @@
-// Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Amaury Johnen, adapted from meshGFaceOptimize
diff --git a/Mesh/meshRefine.cpp b/Mesh/meshRefine.cpp
index 7fba18afe7..91326339f4 100644
--- a/Mesh/meshRefine.cpp
+++ b/Mesh/meshRefine.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Brian Helenbrook
diff --git a/Mesh/multiscalePartition.cpp b/Mesh/multiscalePartition.cpp
index c24bc742ce..3cc8bd4609 100644
--- a/Mesh/multiscalePartition.cpp
+++ b/Mesh/multiscalePartition.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Mesh/multiscalePartition.h b/Mesh/multiscalePartition.h
index 216b255cb4..b38842b1a1 100644
--- a/Mesh/multiscalePartition.h
+++ b/Mesh/multiscalePartition.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Mesh/periodical.cpp b/Mesh/periodical.cpp
index afc927ba25..671d104215 100644
--- a/Mesh/periodical.cpp
+++ b/Mesh/periodical.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier Maxime Melchior
diff --git a/Mesh/periodical.h b/Mesh/periodical.h
index c56c96fbe6..60144ad712 100644
--- a/Mesh/periodical.h
+++ b/Mesh/periodical.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier Maxime Melchior
diff --git a/Mesh/pointInsertion.cpp b/Mesh/pointInsertion.cpp
index 7497dee25d..d363382607 100644
--- a/Mesh/pointInsertion.cpp
+++ b/Mesh/pointInsertion.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Paul-Emile Bernard
 
diff --git a/Mesh/pointInsertion.h b/Mesh/pointInsertion.h
index 4d3a9ec8c8..6b649dc8f4 100644
--- a/Mesh/pointInsertion.h
+++ b/Mesh/pointInsertion.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 
 #ifndef _POINTINSERTION_H_
diff --git a/Mesh/pointInsertionRTreeTools.cpp b/Mesh/pointInsertionRTreeTools.cpp
index 4ed9b22e6a..b43a747f4c 100644
--- a/Mesh/pointInsertionRTreeTools.cpp
+++ b/Mesh/pointInsertionRTreeTools.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Tristan Carrier and Paul-Emile Bernard
 
diff --git a/Mesh/pointInsertionRTreeTools.h b/Mesh/pointInsertionRTreeTools.h
index a4bb441437..d8f950d3d7 100644
--- a/Mesh/pointInsertionRTreeTools.h
+++ b/Mesh/pointInsertionRTreeTools.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Tristan Carrier and Paul-Emile Bernard
 
diff --git a/Mesh/qualityMeasures.cpp b/Mesh/qualityMeasures.cpp
index 5d343b4b50..4dd307a507 100644
--- a/Mesh/qualityMeasures.cpp
+++ b/Mesh/qualityMeasures.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "qualityMeasures.h"
 #include "BDS.h"
diff --git a/Mesh/qualityMeasures.h b/Mesh/qualityMeasures.h
index f84bbd8686..7b713177e4 100644
--- a/Mesh/qualityMeasures.h
+++ b/Mesh/qualityMeasures.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _QUALITY_MEASURES_H_
 #define _QUALITY_MEASURES_H_
diff --git a/Mesh/simple3D.cpp b/Mesh/simple3D.cpp
index af306b7a0b..2cee003ee5 100644
--- a/Mesh/simple3D.cpp
+++ b/Mesh/simple3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier François Henrotte
diff --git a/Mesh/simple3D.h b/Mesh/simple3D.h
index 39e28f4950..4fc4889d53 100644
--- a/Mesh/simple3D.h
+++ b/Mesh/simple3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier François Henrotte
diff --git a/Mesh/surfaceFiller.cpp b/Mesh/surfaceFiller.cpp
index d352c5bf98..cc4192043d 100644
--- a/Mesh/surfaceFiller.cpp
+++ b/Mesh/surfaceFiller.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Tristan Carrier Baudoin
diff --git a/Mesh/surfaceFiller.h b/Mesh/surfaceFiller.h
index ea117c69ae..9e0ee0ce3c 100644
--- a/Mesh/surfaceFiller.h
+++ b/Mesh/surfaceFiller.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 
 #ifndef _SURFACEFILLER_H_
diff --git a/Mesh/yamakawa.cpp b/Mesh/yamakawa.cpp
index 95d5840014..f78f3a6bff 100644
--- a/Mesh/yamakawa.cpp
+++ b/Mesh/yamakawa.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Tristan Carrier and Paul-Emile Bernard
 
diff --git a/Mesh/yamakawa.h b/Mesh/yamakawa.h
index 1bca2c837c..e4aa8c9e71 100644
--- a/Mesh/yamakawa.h
+++ b/Mesh/yamakawa.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Tristan Carrier
 
diff --git a/Numeric/BasisFactory.cpp b/Numeric/BasisFactory.cpp
index a265c36db9..97ed21a7e1 100644
--- a/Numeric/BasisFactory.cpp
+++ b/Numeric/BasisFactory.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-B-> Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "BasisFactory.h"
 #include "GmshDefines.h"
diff --git a/Numeric/BasisFactory.h b/Numeric/BasisFactory.h
index f97a1dc861..c75bcd2e4d 100644
--- a/Numeric/BasisFactory.h
+++ b/Numeric/BasisFactory.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef BASISFACTORY_H
 #define BASISFACTORY_H
diff --git a/Numeric/BergotBasis.cpp b/Numeric/BergotBasis.cpp
index eb97946883..a3eb3fd16d 100644
--- a/Numeric/BergotBasis.cpp
+++ b/Numeric/BergotBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <cmath>
 #include "BergotBasis.h"
diff --git a/Numeric/BergotBasis.h b/Numeric/BergotBasis.h
index 11f9b27a27..1f381e0d83 100644
--- a/Numeric/BergotBasis.h
+++ b/Numeric/BergotBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef BERGOTBASIS_H
 #define BERGOTBASIS_H
diff --git a/Numeric/CMakeLists.txt b/Numeric/CMakeLists.txt
index 1b91546640..e30801bb8e 100644
--- a/Numeric/CMakeLists.txt
+++ b/Numeric/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Numeric.cpp
diff --git a/Numeric/CondNumBasis.cpp b/Numeric/CondNumBasis.cpp
index 9ec41ce4d4..2a514f962c 100644
--- a/Numeric/CondNumBasis.cpp
+++ b/Numeric/CondNumBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "CondNumBasis.h"
 
diff --git a/Numeric/CondNumBasis.h b/Numeric/CondNumBasis.h
index d518a431f3..82a7359960 100644
--- a/Numeric/CondNumBasis.h
+++ b/Numeric/CondNumBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CONDNUMBASIS_H_
 #define _CONDNUMBASIS_H_
diff --git a/Numeric/ConjugateGradients.cpp b/Numeric/ConjugateGradients.cpp
index 62e7905c13..3a607be928 100644
--- a/Numeric/ConjugateGradients.cpp
+++ b/Numeric/ConjugateGradients.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include <math.h>
diff --git a/Numeric/ConjugateGradients.h b/Numeric/ConjugateGradients.h
index f6130e535b..24ae315ac7 100644
--- a/Numeric/ConjugateGradients.h
+++ b/Numeric/ConjugateGradients.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef  _CONJUGATEGRADIENTS
 #define  _CONJUGATEGRADIENTS
diff --git a/Numeric/ElementType.cpp b/Numeric/ElementType.cpp
index b0d3780519..85154f66fb 100644
--- a/Numeric/ElementType.cpp
+++ b/Numeric/ElementType.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "ElementType.h"
 #include "GmshDefines.h"
diff --git a/Numeric/ElementType.h b/Numeric/ElementType.h
index 074c2a9e86..c8e2ef955a 100644
--- a/Numeric/ElementType.h
+++ b/Numeric/ElementType.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ELEMENTTYPE_H_
 #define _ELEMENTTYPE_H_
diff --git a/Numeric/FuncSpaceData.cpp b/Numeric/FuncSpaceData.cpp
index f635dc5cfb..8ad36a6594 100644
--- a/Numeric/FuncSpaceData.cpp
+++ b/Numeric/FuncSpaceData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2012 C. Geuzaine, J.-B-> Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "FuncSpaceData.h"
 #include "MElement.h"
diff --git a/Numeric/FuncSpaceData.h b/Numeric/FuncSpaceData.h
index 05334a6e90..fbc55f6d0f 100644
--- a/Numeric/FuncSpaceData.h
+++ b/Numeric/FuncSpaceData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef FUNCSPACEDATA_H
 #define FUNCSPACEDATA_H
diff --git a/Numeric/GaussIntegration.cpp b/Numeric/GaussIntegration.cpp
index 637d66edf3..3ffca3da97 100644
--- a/Numeric/GaussIntegration.cpp
+++ b/Numeric/GaussIntegration.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GmshDefines.h"
diff --git a/Numeric/GaussIntegration.h b/Numeric/GaussIntegration.h
index dcdc5c3080..b841629a3d 100644
--- a/Numeric/GaussIntegration.h
+++ b/Numeric/GaussIntegration.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GAUSS_INTEGRATION_H_
 #define _GAUSS_INTEGRATION_H_
diff --git a/Numeric/GaussJacobi1D.cpp b/Numeric/GaussJacobi1D.cpp
index cc85d546af..f81ad323b5 100644
--- a/Numeric/GaussJacobi1D.cpp
+++ b/Numeric/GaussJacobi1D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // code to generate this file (using alglib) :
 #if 0
diff --git a/Numeric/GaussJacobi1D.h b/Numeric/GaussJacobi1D.h
index 47e3fbe3e7..f3d79d938a 100644
--- a/Numeric/GaussJacobi1D.h
+++ b/Numeric/GaussJacobi1D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GAUSS_JACOBI_1D_H_
 #define _GAUSS_JACOBI_1D_H_
diff --git a/Numeric/GaussLegendre1D.h b/Numeric/GaussLegendre1D.h
index cc7fed3e67..db192f1ccf 100644
--- a/Numeric/GaussLegendre1D.h
+++ b/Numeric/GaussLegendre1D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 /* 1 point rule points */
 static double _GL_pt1[1]={
diff --git a/Numeric/GaussLegendreSimplex.cpp b/Numeric/GaussLegendreSimplex.cpp
index b74c50d9ae..256ee63e16 100644
--- a/Numeric/GaussLegendreSimplex.cpp
+++ b/Numeric/GaussLegendreSimplex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GaussIntegration.h"
diff --git a/Numeric/GaussQuadratureHex.cpp b/Numeric/GaussQuadratureHex.cpp
index c555842dc0..7d451ea0f3 100644
--- a/Numeric/GaussQuadratureHex.cpp
+++ b/Numeric/GaussQuadratureHex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/GaussQuadratureLin.cpp b/Numeric/GaussQuadratureLin.cpp
index 8522364489..e2e15d441e 100644
--- a/Numeric/GaussQuadratureLin.cpp
+++ b/Numeric/GaussQuadratureLin.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/GaussQuadraturePri.cpp b/Numeric/GaussQuadraturePri.cpp
index cd398a92b2..b34daa27f0 100644
--- a/Numeric/GaussQuadraturePri.cpp
+++ b/Numeric/GaussQuadraturePri.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "GaussIntegration.h"
diff --git a/Numeric/GaussQuadraturePyr.cpp b/Numeric/GaussQuadraturePyr.cpp
index 747163864a..ffa17d9b46 100644
--- a/Numeric/GaussQuadraturePyr.cpp
+++ b/Numeric/GaussQuadraturePyr.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshMessage.h"
 #include "GaussIntegration.h"
diff --git a/Numeric/GaussQuadratureQuad.cpp b/Numeric/GaussQuadratureQuad.cpp
index bd6574c8f9..3565bc257b 100644
--- a/Numeric/GaussQuadratureQuad.cpp
+++ b/Numeric/GaussQuadratureQuad.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/GaussQuadratureTet.cpp b/Numeric/GaussQuadratureTet.cpp
index 442c4ebd0f..e44f319f04 100644
--- a/Numeric/GaussQuadratureTet.cpp
+++ b/Numeric/GaussQuadratureTet.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/GaussQuadratureTri.cpp b/Numeric/GaussQuadratureTri.cpp
index ff18ad321e..7e2e147716 100644
--- a/Numeric/GaussQuadratureTri.cpp
+++ b/Numeric/GaussQuadratureTri.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GaussIntegration.h"
 #include "GaussLegendre1D.h"
diff --git a/Numeric/HilbertCurve.cpp b/Numeric/HilbertCurve.cpp
index 59b24bf48b..e74d05909d 100644
--- a/Numeric/HilbertCurve.cpp
+++ b/Numeric/HilbertCurve.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "SBoundingBox3d.h"
 #include "MVertex.h"
diff --git a/Numeric/HilbertCurve.h b/Numeric/HilbertCurve.h
index f2cafef809..c7d7002218 100644
--- a/Numeric/HilbertCurve.h
+++ b/Numeric/HilbertCurve.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HILBERT_CURVE_
 #define _HILBERT_CURVE_
diff --git a/Numeric/Iso.cpp b/Numeric/Iso.cpp
index 18646939a6..1917d97c67 100644
--- a/Numeric/Iso.cpp
+++ b/Numeric/Iso.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Numeric.h"
 
diff --git a/Numeric/Iso.h b/Numeric/Iso.h
index f729fac027..4bd3cb4c9d 100644
--- a/Numeric/Iso.h
+++ b/Numeric/Iso.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ISO_H_
 #define _ISO_H_
diff --git a/Numeric/JacobianBasis.cpp b/Numeric/JacobianBasis.cpp
index 9e41565be7..1b3ef74eae 100644
--- a/Numeric/JacobianBasis.cpp
+++ b/Numeric/JacobianBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "JacobianBasis.h"
 #include "pointsGenerators.h"
diff --git a/Numeric/JacobianBasis.h b/Numeric/JacobianBasis.h
index 5ebf2f7b79..501f7abf39 100644
--- a/Numeric/JacobianBasis.h
+++ b/Numeric/JacobianBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _JACOBIAN_BASIS_H_
 #define _JACOBIAN_BASIS_H_
diff --git a/Numeric/MetricBasis.cpp b/Numeric/MetricBasis.cpp
index c53a1e8f30..e651597fc5 100644
--- a/Numeric/MetricBasis.cpp
+++ b/Numeric/MetricBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MElement.h"
 #include "AnalyseCurvedMesh.h"
diff --git a/Numeric/MetricBasis.h b/Numeric/MetricBasis.h
index 851d547c08..0764f76811 100644
--- a/Numeric/MetricBasis.h
+++ b/Numeric/MetricBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _METRIC_BASIS_H_
 #define _METRIC_BASIS_H_
diff --git a/Numeric/Numeric.cpp b/Numeric/Numeric.cpp
index bf55db439c..51f2b6bcd1 100644
--- a/Numeric/Numeric.cpp
+++ b/Numeric/Numeric.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "GmshConfig.h"
diff --git a/Numeric/Numeric.h b/Numeric/Numeric.h
index 6aaf065ecc..435a89932f 100644
--- a/Numeric/Numeric.h
+++ b/Numeric/Numeric.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _NUMERIC_H_
 #define _NUMERIC_H_
diff --git a/Numeric/approximationError.cpp b/Numeric/approximationError.cpp
index 4e0c5219c9..8ae3db92d1 100644
--- a/Numeric/approximationError.cpp
+++ b/Numeric/approximationError.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "approximationError.h"
 #include "MElement.h"
diff --git a/Numeric/approximationError.h b/Numeric/approximationError.h
index 2437cba0af..efe7d98884 100644
--- a/Numeric/approximationError.h
+++ b/Numeric/approximationError.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _APPROXIMATION_ERROR_
 #define _APPROXIMATION_ERROR_
diff --git a/Numeric/bezierBasis.cpp b/Numeric/bezierBasis.cpp
index 5484b1df02..34e916b808 100644
--- a/Numeric/bezierBasis.cpp
+++ b/Numeric/bezierBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "GmshDefines.h"
diff --git a/Numeric/bezierBasis.h b/Numeric/bezierBasis.h
index 9bb522f804..19ef6a5bde 100644
--- a/Numeric/bezierBasis.h
+++ b/Numeric/bezierBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BEZIER_BASIS_H_
 #define _BEZIER_BASIS_H_
diff --git a/Numeric/cartesian.h b/Numeric/cartesian.h
index 3eeb9bd17d..db43677f4d 100644
--- a/Numeric/cartesian.h
+++ b/Numeric/cartesian.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CARTESIAN_H_
 #define _CARTESIAN_H_
diff --git a/Numeric/decasteljau.cpp b/Numeric/decasteljau.cpp
index b5369b3b84..304057bc20 100644
--- a/Numeric/decasteljau.cpp
+++ b/Numeric/decasteljau.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by J. Lambrechts
 
diff --git a/Numeric/decasteljau.h b/Numeric/decasteljau.h
index 1e82ff54de..16cb2eee96 100644
--- a/Numeric/decasteljau.h
+++ b/Numeric/decasteljau.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by J. Lambrechts
 
diff --git a/Numeric/discreteFrechetDistance.cpp b/Numeric/discreteFrechetDistance.cpp
index 8d00c04405..5d5c3e55eb 100644
--- a/Numeric/discreteFrechetDistance.cpp
+++ b/Numeric/discreteFrechetDistance.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "discreteFrechetDistance.h"
diff --git a/Numeric/discreteFrechetDistance.h b/Numeric/discreteFrechetDistance.h
index 0f149a5e2f..8014e2f3d8 100644
--- a/Numeric/discreteFrechetDistance.h
+++ b/Numeric/discreteFrechetDistance.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETE_FRECHET_DISTANCE_
 #define _DISCRETE_FRECHET_DISTANCE_
diff --git a/Numeric/fullMatrix.cpp b/Numeric/fullMatrix.cpp
index e4e87624dc..e95c99eb27 100644
--- a/Numeric/fullMatrix.cpp
+++ b/Numeric/fullMatrix.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <complex>
 #include <string.h>
diff --git a/Numeric/fullMatrix.h b/Numeric/fullMatrix.h
index 1883785028..bdee20667e 100644
--- a/Numeric/fullMatrix.h
+++ b/Numeric/fullMatrix.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FULL_MATRIX_H_
 #define _FULL_MATRIX_H_
diff --git a/Numeric/hausdorffDistance.cpp b/Numeric/hausdorffDistance.cpp
index cb9d21ea61..8c747af381 100644
--- a/Numeric/hausdorffDistance.cpp
+++ b/Numeric/hausdorffDistance.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 /*
   compute the hausdorff distance between two polygonal curves
diff --git a/Numeric/jacobiPolynomials.cpp b/Numeric/jacobiPolynomials.cpp
index c89cfb896c..f942b110ee 100644
--- a/Numeric/jacobiPolynomials.cpp
+++ b/Numeric/jacobiPolynomials.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include <cmath>
diff --git a/Numeric/jacobiPolynomials.h b/Numeric/jacobiPolynomials.h
index 71a950fb23..67886df781 100644
--- a/Numeric/jacobiPolynomials.h
+++ b/Numeric/jacobiPolynomials.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef JACOBIPOLYNOMIALS_H
 #define JACOBIPOLYNOMIALS_H
diff --git a/Numeric/legendrePolynomials.cpp b/Numeric/legendrePolynomials.cpp
index 580f3570fa..cb7721cd60 100644
--- a/Numeric/legendrePolynomials.cpp
+++ b/Numeric/legendrePolynomials.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "legendrePolynomials.h"
 
diff --git a/Numeric/legendrePolynomials.h b/Numeric/legendrePolynomials.h
index 38d94314cb..df574140d0 100644
--- a/Numeric/legendrePolynomials.h
+++ b/Numeric/legendrePolynomials.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef LEGENDREPOLYNOMIALS_H
 #define LEGENDREPOLYNOMIALS_H
diff --git a/Numeric/mathEvaluator.cpp b/Numeric/mathEvaluator.cpp
index 74b750a503..d8fb48df9a 100644
--- a/Numeric/mathEvaluator.cpp
+++ b/Numeric/mathEvaluator.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "mathEvaluator.h"
 
diff --git a/Numeric/mathEvaluator.h b/Numeric/mathEvaluator.h
index 90592935cd..d129eca385 100644
--- a/Numeric/mathEvaluator.h
+++ b/Numeric/mathEvaluator.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MATH_EVALUATOR_H_
 #define _MATH_EVALUATOR_H_
diff --git a/Numeric/miniBasis.cpp b/Numeric/miniBasis.cpp
index ca7789a34a..d2bd3d798f 100644
--- a/Numeric/miniBasis.cpp
+++ b/Numeric/miniBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "miniBasis.h"
 #include "BasisFactory.h"
diff --git a/Numeric/miniBasis.h b/Numeric/miniBasis.h
index ce42bdd162..563bc4064f 100644
--- a/Numeric/miniBasis.h
+++ b/Numeric/miniBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MINI_BASIS_H_
 #define _MINI_BASIS_H_
diff --git a/Numeric/nodalBasis.cpp b/Numeric/nodalBasis.cpp
index 9b96eccb48..b93f52a0c8 100644
--- a/Numeric/nodalBasis.cpp
+++ b/Numeric/nodalBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <limits>
 #include <cmath>
diff --git a/Numeric/nodalBasis.h b/Numeric/nodalBasis.h
index 5974f4a253..ec61eff8cb 100644
--- a/Numeric/nodalBasis.h
+++ b/Numeric/nodalBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef NODALBASIS_H
 #define NODALBASIS_H
diff --git a/Numeric/pointsGenerators.cpp b/Numeric/pointsGenerators.cpp
index a5f7342d1e..0d9b50d310 100644
--- a/Numeric/pointsGenerators.cpp
+++ b/Numeric/pointsGenerators.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "pointsGenerators.h"
 #include "GmshDefines.h"
diff --git a/Numeric/pointsGenerators.h b/Numeric/pointsGenerators.h
index dd98051400..e5b65d9758 100644
--- a/Numeric/pointsGenerators.h
+++ b/Numeric/pointsGenerators.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef POINTSGENERATORS_H
 #define POINTSGENERATORS_H
diff --git a/Numeric/polynomialBasis.cpp b/Numeric/polynomialBasis.cpp
index 9339243966..3c3596b186 100644
--- a/Numeric/polynomialBasis.cpp
+++ b/Numeric/polynomialBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Koen Hillewaert
diff --git a/Numeric/polynomialBasis.h b/Numeric/polynomialBasis.h
index 00149b1799..0e03da27ff 100644
--- a/Numeric/polynomialBasis.h
+++ b/Numeric/polynomialBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _POLYNOMIAL_BASIS_H_
 #define _POLYNOMIAL_BASIS_H_
diff --git a/Numeric/pyramidalBasis.cpp b/Numeric/pyramidalBasis.cpp
index d712e1d08c..aed648cb99 100644
--- a/Numeric/pyramidalBasis.cpp
+++ b/Numeric/pyramidalBasis.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <cmath>
 #include <algorithm>
diff --git a/Numeric/pyramidalBasis.h b/Numeric/pyramidalBasis.h
index 483bb47b79..abe8d0d45f 100644
--- a/Numeric/pyramidalBasis.h
+++ b/Numeric/pyramidalBasis.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef PYRAMIDALBASIS_H
 #define PYRAMIDALBASIS_H
diff --git a/Numeric/robustPredicates.h b/Numeric/robustPredicates.h
index 22504338c7..791d540f93 100644
--- a/Numeric/robustPredicates.h
+++ b/Numeric/robustPredicates.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ROBUST_PREDICATES_H_
 #define _ROBUST_PREDICATES_H_
diff --git a/Numeric/simpleFunction.h b/Numeric/simpleFunction.h
index fe21918282..19f83cb1c0 100644
--- a/Numeric/simpleFunction.h
+++ b/Numeric/simpleFunction.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SIMPLE_FUNCTION_H_
 #define _SIMPLE_FUNCTION_H_
diff --git a/Numeric/simpleFunctionPython.h b/Numeric/simpleFunctionPython.h
index c89b481093..a2ecbaddf3 100644
--- a/Numeric/simpleFunctionPython.h
+++ b/Numeric/simpleFunctionPython.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SIMPLE_FUNCTION_PYTHON_H_
 #define _SIMPLE_FUNCTION_PYTHON_H_
diff --git a/Parser/CMakeLists.txt b/Parser/CMakeLists.txt
index 58fac8e898..b5f956da8f 100644
--- a/Parser/CMakeLists.txt
+++ b/Parser/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Gmsh.tab.cpp
diff --git a/Parser/FunctionManager.cpp b/Parser/FunctionManager.cpp
index 93d546b60d..8a71b78342 100644
--- a/Parser/FunctionManager.cpp
+++ b/Parser/FunctionManager.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <map>
 #include <stack>
diff --git a/Parser/FunctionManager.h b/Parser/FunctionManager.h
index 19cb68be23..969e9d7889 100644
--- a/Parser/FunctionManager.h
+++ b/Parser/FunctionManager.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FUNCTION_MANAGER_H_
 #define _FUNCTION_MANAGER_H_
diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l
index 725db43c28..a210b7464d 100644
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -2,7 +2,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 1b9f47b661..83c73067e0 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -75,7 +75,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <map>
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index c607781270..aba5085548 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -2,7 +2,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <map>
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 8466f6be6e..43ac601c30 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -1096,7 +1096,7 @@ char *gmsh_yytext;
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Parser/Parser.h b/Parser/Parser.h
index 37ff379e85..c73afc0127 100644
--- a/Parser/Parser.h
+++ b/Parser/Parser.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARSER_H_
 #define _PARSER_H_
diff --git a/Plugin/AnalyseCurvedMesh.cpp b/Plugin/AnalyseCurvedMesh.cpp
index 571f8fc58a..3b3cc3c1c8 100644
--- a/Plugin/AnalyseCurvedMesh.cpp
+++ b/Plugin/AnalyseCurvedMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "AnalyseCurvedMesh.h"
 #include "OS.h"
diff --git a/Plugin/AnalyseCurvedMesh.h b/Plugin/AnalyseCurvedMesh.h
index abbf102c78..85b403d5b2 100644
--- a/Plugin/AnalyseCurvedMesh.h
+++ b/Plugin/AnalyseCurvedMesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ANALYSECURVEDMESH_H_
 #define _ANALYSECURVEDMESH_H_
diff --git a/Plugin/Annotate.cpp b/Plugin/Annotate.cpp
index 127f8db479..8d732101be 100644
--- a/Plugin/Annotate.cpp
+++ b/Plugin/Annotate.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include "GmshConfig.h"
diff --git a/Plugin/Annotate.h b/Plugin/Annotate.h
index a72a2e63b9..853b19c85c 100644
--- a/Plugin/Annotate.h
+++ b/Plugin/Annotate.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ANNOTATE_H_
 #define _ANNOTATE_H_
diff --git a/Plugin/Bubbles.cpp b/Plugin/Bubbles.cpp
index 058bb8b513..905f8235a6 100644
--- a/Plugin/Bubbles.cpp
+++ b/Plugin/Bubbles.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Plugin/Bubbles.h b/Plugin/Bubbles.h
index b1d96cf32a..42b22f5d65 100644
--- a/Plugin/Bubbles.h
+++ b/Plugin/Bubbles.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _BUBBLES_H_
 #define _BUBBLES_H_
diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt
index dd19613fd0..5c98130f5b 100644
--- a/Plugin/CMakeLists.txt
+++ b/Plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Plugin.cpp PluginManager.cpp
diff --git a/Plugin/CVTRemesh.cpp b/Plugin/CVTRemesh.cpp
index e09877c565..42b3f3b67e 100644
--- a/Plugin/CVTRemesh.cpp
+++ b/Plugin/CVTRemesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Plugin/CVTRemesh.h b/Plugin/CVTRemesh.h
index 41bfd1894c..c3f7540d4e 100644
--- a/Plugin/CVTRemesh.h
+++ b/Plugin/CVTRemesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2014 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CVT_REMESH_H_
 #define _CVT_REMESH_H_
diff --git a/Plugin/Crack.cpp b/Plugin/Crack.cpp
index 01f36250a6..68b8dec25b 100644
--- a/Plugin/Crack.cpp
+++ b/Plugin/Crack.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Crack.h"
 #include "GModel.h"
diff --git a/Plugin/Crack.h b/Plugin/Crack.h
index e38784035a..73c8ed7e02 100644
--- a/Plugin/Crack.h
+++ b/Plugin/Crack.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CRACK_H_
 #define _CRACK_H_
diff --git a/Plugin/Curl.cpp b/Plugin/Curl.cpp
index 0337cc7ad5..3fa8464e97 100644
--- a/Plugin/Curl.cpp
+++ b/Plugin/Curl.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Curl.h"
 #include "shapeFunctions.h"
diff --git a/Plugin/Curl.h b/Plugin/Curl.h
index d1af7f4851..910a437019 100644
--- a/Plugin/Curl.h
+++ b/Plugin/Curl.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CURL_H_
 #define _CURL_H_
diff --git a/Plugin/CurvedBndDist.cpp b/Plugin/CurvedBndDist.cpp
index 10d9c5de97..7ffe58aab1 100644
--- a/Plugin/CurvedBndDist.cpp
+++ b/Plugin/CurvedBndDist.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Gmsh.h"
 #include "GmshConfig.h"
diff --git a/Plugin/CurvedBndDist.h b/Plugin/CurvedBndDist.h
index 904e5ba391..4d13061170 100644
--- a/Plugin/CurvedBndDist.h
+++ b/Plugin/CurvedBndDist.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CURVEDBNDDIST_H_
 #define _CURVEDBNDDIST_H_
diff --git a/Plugin/CutBox.cpp b/Plugin/CutBox.cpp
index b66e4e0577..850b407a07 100644
--- a/Plugin/CutBox.cpp
+++ b/Plugin/CutBox.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "OctreePost.h"
diff --git a/Plugin/CutBox.h b/Plugin/CutBox.h
index d30916a273..bbefe30290 100644
--- a/Plugin/CutBox.h
+++ b/Plugin/CutBox.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_BOX_H_
 #define _CUT_BOX_H_
diff --git a/Plugin/CutGrid.cpp b/Plugin/CutGrid.cpp
index 512c797a0f..88475df7e4 100644
--- a/Plugin/CutGrid.cpp
+++ b/Plugin/CutGrid.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "OctreePost.h"
diff --git a/Plugin/CutGrid.h b/Plugin/CutGrid.h
index f1fe120dad..b7cd56387b 100644
--- a/Plugin/CutGrid.h
+++ b/Plugin/CutGrid.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_GRID_H_
 #define _CUT_GRID_H_
diff --git a/Plugin/CutMesh.cpp b/Plugin/CutMesh.cpp
index f96eba77cd..66cdf4b4cb 100644
--- a/Plugin/CutMesh.cpp
+++ b/Plugin/CutMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "CutMesh.h"
 #include "GModel.h"
diff --git a/Plugin/CutMesh.h b/Plugin/CutMesh.h
index 5bbc488539..b4822827c6 100644
--- a/Plugin/CutMesh.h
+++ b/Plugin/CutMesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUTMESH_H_
 #define _CUTMESH_H_
diff --git a/Plugin/CutParametric.cpp b/Plugin/CutParametric.cpp
index 09ca7b565d..3678ca4793 100644
--- a/Plugin/CutParametric.cpp
+++ b/Plugin/CutParametric.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GmshConfig.h"
diff --git a/Plugin/CutParametric.h b/Plugin/CutParametric.h
index 780303b2ae..73b7aedb16 100644
--- a/Plugin/CutParametric.h
+++ b/Plugin/CutParametric.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_PARAMETRIC_H_
 #define _CUT_PARAMETRIC_H_
diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp
index 9bf63af5b5..e17a4288fa 100644
--- a/Plugin/CutPlane.cpp
+++ b/Plugin/CutPlane.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "CutPlane.h"
diff --git a/Plugin/CutPlane.h b/Plugin/CutPlane.h
index baa5961133..bec9eef468 100644
--- a/Plugin/CutPlane.h
+++ b/Plugin/CutPlane.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_PLANE_H_
 #define _CUT_PLANE_H_
diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp
index 12496af8bb..14a33786fa 100644
--- a/Plugin/CutSphere.cpp
+++ b/Plugin/CutSphere.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "GmshConfig.h"
diff --git a/Plugin/CutSphere.h b/Plugin/CutSphere.h
index 0740f1418c..74ef8aa259 100644
--- a/Plugin/CutSphere.h
+++ b/Plugin/CutSphere.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CUT_SPHERE_H_
 #define _CUT_SPHERE_H_
diff --git a/Plugin/DiscretizationError.cpp b/Plugin/DiscretizationError.cpp
index 31b2de9f8d..e791b665a5 100644
--- a/Plugin/DiscretizationError.cpp
+++ b/Plugin/DiscretizationError.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "DiscretizationError.h"
 #include "Numeric.h"
diff --git a/Plugin/DiscretizationError.h b/Plugin/DiscretizationError.h
index bc1928bb04..d10a8afc21 100644
--- a/Plugin/DiscretizationError.h
+++ b/Plugin/DiscretizationError.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISCRETIZATION_ERROR_H_
 #define _DISCRETIZATION_ERROR_H_
diff --git a/Plugin/Distance.cpp b/Plugin/Distance.cpp
index 2f287aed27..3c72320ea7 100644
--- a/Plugin/Distance.cpp
+++ b/Plugin/Distance.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Plugin/Distance.h b/Plugin/Distance.h
index d8147c80f9..7cb83a0be2 100644
--- a/Plugin/Distance.h
+++ b/Plugin/Distance.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISTANCE_H_
 #define _DISTANCE_H_
diff --git a/Plugin/Divergence.cpp b/Plugin/Divergence.cpp
index 947b6c3513..5c69d580f5 100644
--- a/Plugin/Divergence.cpp
+++ b/Plugin/Divergence.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Divergence.h"
 #include "shapeFunctions.h"
diff --git a/Plugin/Divergence.h b/Plugin/Divergence.h
index 65407eb63a..eeb9f20263 100644
--- a/Plugin/Divergence.h
+++ b/Plugin/Divergence.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DIVERGENCE_H_
 #define _DIVERGENCE_H_
diff --git a/Plugin/DuplicateBoundaries.cpp b/Plugin/DuplicateBoundaries.cpp
index db6b15c2aa..92a91a763c 100644
--- a/Plugin/DuplicateBoundaries.cpp
+++ b/Plugin/DuplicateBoundaries.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "DuplicateBoundaries.h"
 #include "GModel.h"
diff --git a/Plugin/DuplicateBoundaries.h b/Plugin/DuplicateBoundaries.h
index ac4dbc67ab..6fa59e7ac1 100644
--- a/Plugin/DuplicateBoundaries.h
+++ b/Plugin/DuplicateBoundaries.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DUPLICATEBOUNDARIES_H_
 #define _DUPLICATEBOUNDARIES_H_
diff --git a/Plugin/Eigenvalues.cpp b/Plugin/Eigenvalues.cpp
index 147aad10ec..d1c8a834d7 100644
--- a/Plugin/Eigenvalues.cpp
+++ b/Plugin/Eigenvalues.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Eigenvalues.h"
 #include "Numeric.h"
diff --git a/Plugin/Eigenvalues.h b/Plugin/Eigenvalues.h
index a815f343b1..f06b8bdd8d 100644
--- a/Plugin/Eigenvalues.h
+++ b/Plugin/Eigenvalues.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EIGENVALUES_H_
 #define _EIGENVALUES_H_
diff --git a/Plugin/Eigenvectors.cpp b/Plugin/Eigenvectors.cpp
index 62c003ecf8..4cf9764beb 100644
--- a/Plugin/Eigenvectors.cpp
+++ b/Plugin/Eigenvectors.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Eigenvectors.h"
 #include "Numeric.h"
diff --git a/Plugin/Eigenvectors.h b/Plugin/Eigenvectors.h
index 25924d637c..213828c757 100644
--- a/Plugin/Eigenvectors.h
+++ b/Plugin/Eigenvectors.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EIGENVECTORS_H_
 #define _EIGENVECTORS_H_
diff --git a/Plugin/ExtractEdges.cpp b/Plugin/ExtractEdges.cpp
index fc663af1b6..1ee7930302 100644
--- a/Plugin/ExtractEdges.cpp
+++ b/Plugin/ExtractEdges.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GModel.h"
diff --git a/Plugin/ExtractEdges.h b/Plugin/ExtractEdges.h
index c474b00452..7e022e35b8 100644
--- a/Plugin/ExtractEdges.h
+++ b/Plugin/ExtractEdges.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EXTRACT_EDGES_H_
 #define _EXTRACT_EDGES_H_
diff --git a/Plugin/ExtractElements.cpp b/Plugin/ExtractElements.cpp
index 4075554caa..964beebf0e 100644
--- a/Plugin/ExtractElements.cpp
+++ b/Plugin/ExtractElements.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "ExtractElements.h"
 #include "Numeric.h"
diff --git a/Plugin/ExtractElements.h b/Plugin/ExtractElements.h
index 4e123b69b9..ea36a93a74 100644
--- a/Plugin/ExtractElements.h
+++ b/Plugin/ExtractElements.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EXTRACT_ELEMENTS_H_
 #define _EXTRACT_ELEMENTS_H_
diff --git a/Plugin/FaultZone.cpp b/Plugin/FaultZone.cpp
index 3d1177358c..08043fbd2a 100644
--- a/Plugin/FaultZone.cpp
+++ b/Plugin/FaultZone.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <assert.h>
 #include <sstream>
diff --git a/Plugin/FaultZone.h b/Plugin/FaultZone.h
index 61b68a1f80..c5ef6d9b7c 100644
--- a/Plugin/FaultZone.h
+++ b/Plugin/FaultZone.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_FAULTZONE_H_
 #define _MESH_FAULTZONE_H_
diff --git a/Plugin/FieldFromAmplitudePhase.cpp b/Plugin/FieldFromAmplitudePhase.cpp
index 12c228dc6d..e784592227 100644
--- a/Plugin/FieldFromAmplitudePhase.cpp
+++ b/Plugin/FieldFromAmplitudePhase.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Plugin/FieldFromAmplitudePhase.h b/Plugin/FieldFromAmplitudePhase.h
index ca908782ca..c64fcecd5b 100644
--- a/Plugin/FieldFromAmplitudePhase.h
+++ b/Plugin/FieldFromAmplitudePhase.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FIELD_FROM_AMPLITUDE_PHASE_H_
 #define _FIELD_FROM_AMPLITUDE_PHASE_H_
diff --git a/Plugin/Gradient.cpp b/Plugin/Gradient.cpp
index af7fd40a91..e6a7fd4743 100644
--- a/Plugin/Gradient.cpp
+++ b/Plugin/Gradient.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Gradient.h"
 #include "shapeFunctions.h"
diff --git a/Plugin/Gradient.h b/Plugin/Gradient.h
index 29633007b6..fb9a0671be 100644
--- a/Plugin/Gradient.h
+++ b/Plugin/Gradient.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GRADIENT_H_
 #define _GRADIENT_H_
diff --git a/Plugin/HarmonicToTime.cpp b/Plugin/HarmonicToTime.cpp
index 2ef30ab049..95ce5e43a5 100644
--- a/Plugin/HarmonicToTime.cpp
+++ b/Plugin/HarmonicToTime.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "HarmonicToTime.h"
 #include "GmshDefines.h"
diff --git a/Plugin/HarmonicToTime.h b/Plugin/HarmonicToTime.h
index 8ffc02b8b9..61f19805e6 100644
--- a/Plugin/HarmonicToTime.h
+++ b/Plugin/HarmonicToTime.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HARMONIC_TO_TIME_H_
 #define _HARMONIC_TO_TIME_H_
diff --git a/Plugin/HomologyComputation.cpp b/Plugin/HomologyComputation.cpp
index 948d17ffea..06b699ebcd 100644
--- a/Plugin/HomologyComputation.cpp
+++ b/Plugin/HomologyComputation.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Plugin/HomologyComputation.h b/Plugin/HomologyComputation.h
index adbadb2776..06c043a72e 100644
--- a/Plugin/HomologyComputation.h
+++ b/Plugin/HomologyComputation.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Plugin/HomologyPostProcessing.cpp b/Plugin/HomologyPostProcessing.cpp
index 7e482eb917..6a583783cb 100644
--- a/Plugin/HomologyPostProcessing.cpp
+++ b/Plugin/HomologyPostProcessing.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Plugin/HomologyPostProcessing.h b/Plugin/HomologyPostProcessing.h
index 97eb012345..bed4b7587a 100644
--- a/Plugin/HomologyPostProcessing.h
+++ b/Plugin/HomologyPostProcessing.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@microsoft.com>.
 
diff --git a/Plugin/Integrate.cpp b/Plugin/Integrate.cpp
index b3d3326d18..b0dff3a82b 100644
--- a/Plugin/Integrate.cpp
+++ b/Plugin/Integrate.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Integrate.h"
 #include "shapeFunctions.h"
diff --git a/Plugin/Integrate.h b/Plugin/Integrate.h
index b0466c7632..f7ddf46ed4 100644
--- a/Plugin/Integrate.h
+++ b/Plugin/Integrate.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _INTEGRATE_H_
 #define _INTEGRATE_H_
diff --git a/Plugin/Isosurface.cpp b/Plugin/Isosurface.cpp
index cecb8fc3c4..f38bb5fe71 100644
--- a/Plugin/Isosurface.cpp
+++ b/Plugin/Isosurface.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Isosurface.h"
 #include "Context.h"
diff --git a/Plugin/Isosurface.h b/Plugin/Isosurface.h
index f2363c188c..1ba8c87f04 100644
--- a/Plugin/Isosurface.h
+++ b/Plugin/Isosurface.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ISOSURFACE_H_
 #define _ISOSURFACE_H_
diff --git a/Plugin/Lambda2.cpp b/Plugin/Lambda2.cpp
index baf771a759..a14a0cfdad 100644
--- a/Plugin/Lambda2.cpp
+++ b/Plugin/Lambda2.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Lambda2.h"
 #include "Numeric.h"
diff --git a/Plugin/Lambda2.h b/Plugin/Lambda2.h
index 6d7ecb142f..eced4abf52 100644
--- a/Plugin/Lambda2.h
+++ b/Plugin/Lambda2.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LAMBDA2_H_
 #define _LAMBDA2_H_
diff --git a/Plugin/Levelset.cpp b/Plugin/Levelset.cpp
index c02f5e4d56..49d35d3a37 100644
--- a/Plugin/Levelset.cpp
+++ b/Plugin/Levelset.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Levelset.h"
 #include "MakeSimplex.h"
diff --git a/Plugin/Levelset.h b/Plugin/Levelset.h
index d9c3671527..a8f3bb847b 100644
--- a/Plugin/Levelset.h
+++ b/Plugin/Levelset.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LEVELSET_H_
 #define _LEVELSET_H_
diff --git a/Plugin/LongitudeLatitude.cpp b/Plugin/LongitudeLatitude.cpp
index cfa26a06c2..6d55e98103 100644
--- a/Plugin/LongitudeLatitude.cpp
+++ b/Plugin/LongitudeLatitude.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "LongitudeLatitude.h"
diff --git a/Plugin/LongitudeLatitude.h b/Plugin/LongitudeLatitude.h
index 62470d562e..247ba19d30 100644
--- a/Plugin/LongitudeLatitude.h
+++ b/Plugin/LongitudeLatitude.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LONGITUDELATITUDE_H_
 #define _LONGITUDELATITUDE_H_
diff --git a/Plugin/MakeSimplex.cpp b/Plugin/MakeSimplex.cpp
index 6f0acfec79..2b14a3eb05 100644
--- a/Plugin/MakeSimplex.cpp
+++ b/Plugin/MakeSimplex.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MakeSimplex.h"
 
diff --git a/Plugin/MakeSimplex.h b/Plugin/MakeSimplex.h
index 713dfa6791..c20ad79c46 100644
--- a/Plugin/MakeSimplex.h
+++ b/Plugin/MakeSimplex.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MAKE_SIMPLEX_H_
 #define _MAKE_SIMPLEX_H_
diff --git a/Plugin/MathEval.cpp b/Plugin/MathEval.cpp
index 53590420ab..d75d300c5b 100644
--- a/Plugin/MathEval.cpp
+++ b/Plugin/MathEval.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshDefines.h"
diff --git a/Plugin/MathEval.h b/Plugin/MathEval.h
index 502eb0a6ac..23b9ece1b1 100644
--- a/Plugin/MathEval.h
+++ b/Plugin/MathEval.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MATH_EVAL_H_
 #define _MATH_EVAL_H_
diff --git a/Plugin/MeshSubEntities.cpp b/Plugin/MeshSubEntities.cpp
index fd4ce5b2ff..45a56f1dee 100644
--- a/Plugin/MeshSubEntities.cpp
+++ b/Plugin/MeshSubEntities.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MeshSubEntities.h"
 #include "GModel.h"
diff --git a/Plugin/MeshSubEntities.h b/Plugin/MeshSubEntities.h
index 024a080049..e9f1e02cd3 100644
--- a/Plugin/MeshSubEntities.h
+++ b/Plugin/MeshSubEntities.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MESH_ENTITIES_H_
 #define _MESH_ENTITIES_H_
diff --git a/Plugin/MinMax.cpp b/Plugin/MinMax.cpp
index 84bd609ad6..7694e55997 100644
--- a/Plugin/MinMax.cpp
+++ b/Plugin/MinMax.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "MinMax.h"
 #include "PViewOptions.h"
diff --git a/Plugin/MinMax.h b/Plugin/MinMax.h
index dd072e5d3b..06032f407b 100644
--- a/Plugin/MinMax.h
+++ b/Plugin/MinMax.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MIN_MAX_H_
 #define _MIN_MAX_H_
diff --git a/Plugin/ModifyComponents.cpp b/Plugin/ModifyComponents.cpp
index 78af61ea28..6247ec8cbd 100644
--- a/Plugin/ModifyComponents.cpp
+++ b/Plugin/ModifyComponents.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include <algorithm>
diff --git a/Plugin/ModifyComponents.h b/Plugin/ModifyComponents.h
index b5394d8d9e..597bc6b5aa 100644
--- a/Plugin/ModifyComponents.h
+++ b/Plugin/ModifyComponents.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MODIFY_COMPONENT_H_
 #define _MODIFY_COMPONENT_H_
diff --git a/Plugin/ModulusPhase.cpp b/Plugin/ModulusPhase.cpp
index 94ed51f7f9..5a465db2a3 100644
--- a/Plugin/ModulusPhase.cpp
+++ b/Plugin/ModulusPhase.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "ModulusPhase.h"
 
diff --git a/Plugin/ModulusPhase.h b/Plugin/ModulusPhase.h
index ecdfb60955..7d5650d767 100644
--- a/Plugin/ModulusPhase.h
+++ b/Plugin/ModulusPhase.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MODULUS_PHASE_H_
 #define _MODULUS_PHASE_H_
diff --git a/Plugin/NearToFarField.cpp b/Plugin/NearToFarField.cpp
index 5056a237cf..3910cbecd9 100644
--- a/Plugin/NearToFarField.cpp
+++ b/Plugin/NearToFarField.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Ruth Sabariego
diff --git a/Plugin/NearToFarField.h b/Plugin/NearToFarField.h
index ae0bebbd68..f4264643e6 100644
--- a/Plugin/NearToFarField.h
+++ b/Plugin/NearToFarField.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _NEARTOFARFIELD_H_
 #define _NEARTOFARFIELD_H_
diff --git a/Plugin/NearestNeighbor.cpp b/Plugin/NearestNeighbor.cpp
index e571dad258..0e327eb855 100644
--- a/Plugin/NearestNeighbor.cpp
+++ b/Plugin/NearestNeighbor.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "NearestNeighbor.h"
diff --git a/Plugin/NearestNeighbor.h b/Plugin/NearestNeighbor.h
index a6892b70cb..3166237d1b 100644
--- a/Plugin/NearestNeighbor.h
+++ b/Plugin/NearestNeighbor.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _NEAREST_NEIGHBOR_H_
 #define _NEAREST_NEIGHBOR_H_
diff --git a/Plugin/NewView.cpp b/Plugin/NewView.cpp
index f51fb53a12..976cbcf34b 100644
--- a/Plugin/NewView.cpp
+++ b/Plugin/NewView.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Ruth Sabariego  & Francois Henrotte
diff --git a/Plugin/NewView.h b/Plugin/NewView.h
index 24d7ae6321..de0d77b770 100644
--- a/Plugin/NewView.h
+++ b/Plugin/NewView.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _NEWVIEW_H_
 #define _NEWVIEW_H_
diff --git a/Plugin/Particles.cpp b/Plugin/Particles.cpp
index 6b233b6353..913f957d71 100644
--- a/Plugin/Particles.cpp
+++ b/Plugin/Particles.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GmshConfig.h"
diff --git a/Plugin/Particles.h b/Plugin/Particles.h
index 51d9f356d9..22a3a839d8 100644
--- a/Plugin/Particles.h
+++ b/Plugin/Particles.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PARTICLES_H_
 #define _PARTICLES_H_
diff --git a/Plugin/Plugin.cpp b/Plugin/Plugin.cpp
index 6f07b7ced3..c46ba2bda4 100644
--- a/Plugin/Plugin.cpp
+++ b/Plugin/Plugin.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <sstream>
 #include <stdio.h>
diff --git a/Plugin/Plugin.h b/Plugin/Plugin.h
index 51d64c9861..75236534df 100644
--- a/Plugin/Plugin.h
+++ b/Plugin/Plugin.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PLUGIN_H_
 #define _PLUGIN_H_
diff --git a/Plugin/PluginManager.cpp b/Plugin/PluginManager.cpp
index 352a4a8c55..30cd50bc04 100644
--- a/Plugin/PluginManager.cpp
+++ b/Plugin/PluginManager.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <map>
 #include <stdlib.h>
diff --git a/Plugin/PluginManager.h b/Plugin/PluginManager.h
index eb20695795..40e83ef981 100644
--- a/Plugin/PluginManager.h
+++ b/Plugin/PluginManager.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PLUGIN_MANAGER_H_
 #define _PLUGIN_MANAGER_H_
diff --git a/Plugin/Probe.cpp b/Plugin/Probe.cpp
index 5d7359b6f1..ba1dc5084e 100644
--- a/Plugin/Probe.cpp
+++ b/Plugin/Probe.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "Probe.h"
diff --git a/Plugin/Probe.h b/Plugin/Probe.h
index af86de9438..81d71f3812 100644
--- a/Plugin/Probe.h
+++ b/Plugin/Probe.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PROBE_H_
 #define _PROBE_H_
diff --git a/Plugin/Remove.cpp b/Plugin/Remove.cpp
index 3e7fe9ac13..66ca38c0d2 100644
--- a/Plugin/Remove.cpp
+++ b/Plugin/Remove.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Remove.h"
 
diff --git a/Plugin/Remove.h b/Plugin/Remove.h
index 9670a7247f..cd6bc65c4d 100644
--- a/Plugin/Remove.h
+++ b/Plugin/Remove.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _REMOVE_H_
 #define _REMOVE_H_
diff --git a/Plugin/Scal2Tens.cpp b/Plugin/Scal2Tens.cpp
index d1bd0a0371..fe5421693d 100644
--- a/Plugin/Scal2Tens.cpp
+++ b/Plugin/Scal2Tens.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Scal2Tens.h"
 #include "PViewOptions.h"
diff --git a/Plugin/Scal2Tens.h b/Plugin/Scal2Tens.h
index 144a74e434..ed77d856fd 100644
--- a/Plugin/Scal2Tens.h
+++ b/Plugin/Scal2Tens.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SCAL2TENS_H_
 #define _SCAL2TENS_H_
diff --git a/Plugin/Scal2Vec.cpp b/Plugin/Scal2Vec.cpp
index f42f5b1e08..5a10a7beaa 100644
--- a/Plugin/Scal2Vec.cpp
+++ b/Plugin/Scal2Vec.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Scal2Vec.h"
 #include "PViewOptions.h"
diff --git a/Plugin/Scal2Vec.h b/Plugin/Scal2Vec.h
index ba13a8ef72..0196e1e1c5 100644
--- a/Plugin/Scal2Vec.h
+++ b/Plugin/Scal2Vec.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SCAL2VEC_H_
 #define _SCAL2VEC_H_
diff --git a/Plugin/SimplePartition.cpp b/Plugin/SimplePartition.cpp
index df0dc25212..e319c9498d 100644
--- a/Plugin/SimplePartition.cpp
+++ b/Plugin/SimplePartition.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "SimplePartition.h"
 #include "GModel.h"
diff --git a/Plugin/SimplePartition.h b/Plugin/SimplePartition.h
index ecb12fb8ed..94816d0f26 100644
--- a/Plugin/SimplePartition.h
+++ b/Plugin/SimplePartition.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SIMPLE_PARTITION_H_
 #define _SIMPLE_PARTITION_H_
diff --git a/Plugin/Skin.cpp b/Plugin/Skin.cpp
index ed22e7559b..821d3e1ed0 100644
--- a/Plugin/Skin.cpp
+++ b/Plugin/Skin.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <set>
 #include "Skin.h"
diff --git a/Plugin/Skin.h b/Plugin/Skin.h
index d3e18f4a0d..137092ca11 100644
--- a/Plugin/Skin.h
+++ b/Plugin/Skin.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SKIN_H_
 #define _SKIN_H_
diff --git a/Plugin/Smooth.cpp b/Plugin/Smooth.cpp
index c1554c08fd..785b0a700d 100644
--- a/Plugin/Smooth.cpp
+++ b/Plugin/Smooth.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Smooth.h"
 
diff --git a/Plugin/Smooth.h b/Plugin/Smooth.h
index 592a48db6c..b2b3ca9391 100644
--- a/Plugin/Smooth.h
+++ b/Plugin/Smooth.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SMOOTH_H_
 #define _SMOOTH_H_
diff --git a/Plugin/SphericalRaise.cpp b/Plugin/SphericalRaise.cpp
index 08530d2904..508233631b 100644
--- a/Plugin/SphericalRaise.cpp
+++ b/Plugin/SphericalRaise.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "SphericalRaise.h"
 #include "Numeric.h"
diff --git a/Plugin/SphericalRaise.h b/Plugin/SphericalRaise.h
index 4d0a7c8c3c..e7c352210c 100644
--- a/Plugin/SphericalRaise.h
+++ b/Plugin/SphericalRaise.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPHERICAL_RAISE_H_
 #define _SPHERICAL_RAISE_H_
diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp
index a02440d82c..8bc50bab4f 100644
--- a/Plugin/StreamLines.cpp
+++ b/Plugin/StreamLines.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include "GmshConfig.h"
diff --git a/Plugin/StreamLines.h b/Plugin/StreamLines.h
index f518da5239..c8ce908169 100644
--- a/Plugin/StreamLines.h
+++ b/Plugin/StreamLines.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _STREAM_LINES_H_
 #define _STREAM_LINES_H_
diff --git a/Plugin/Tetrahedralize.cpp b/Plugin/Tetrahedralize.cpp
index 59b7e79702..90e87d7f71 100644
--- a/Plugin/Tetrahedralize.cpp
+++ b/Plugin/Tetrahedralize.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include "GmshConfig.h"
diff --git a/Plugin/Tetrahedralize.h b/Plugin/Tetrahedralize.h
index d59e201434..3e0b8ac050 100644
--- a/Plugin/Tetrahedralize.h
+++ b/Plugin/Tetrahedralize.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TETRAHEDRALIZE_H_
 #define _TETRAHEDRALIZE_H_
diff --git a/Plugin/ThinLayerFixMesh.cpp b/Plugin/ThinLayerFixMesh.cpp
index 47eebc0621..166e47156c 100644
--- a/Plugin/ThinLayerFixMesh.cpp
+++ b/Plugin/ThinLayerFixMesh.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Author: Nicolas Kowalski
 
diff --git a/Plugin/ThinLayerFixMesh.h b/Plugin/ThinLayerFixMesh.h
index 5575cb496a..934f63638d 100644
--- a/Plugin/ThinLayerFixMesh.h
+++ b/Plugin/ThinLayerFixMesh.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2013 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Author: Nicolas Kowalski
 
diff --git a/Plugin/Transform.cpp b/Plugin/Transform.cpp
index 8a0afc99c8..46a37a40dc 100644
--- a/Plugin/Transform.cpp
+++ b/Plugin/Transform.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Transform.h"
 
diff --git a/Plugin/Transform.h b/Plugin/Transform.h
index d9bbc87b3c..8daa77336e 100644
--- a/Plugin/Transform.h
+++ b/Plugin/Transform.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TRANSFORM_H_
 #define _TRANSFORM_H_
diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp
index 60088ce4a7..0f59903bdc 100644
--- a/Plugin/Triangulate.cpp
+++ b/Plugin/Triangulate.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <vector>
 #include <stdlib.h>
diff --git a/Plugin/Triangulate.h b/Plugin/Triangulate.h
index 133f9b8917..ea434c7eaf 100644
--- a/Plugin/Triangulate.h
+++ b/Plugin/Triangulate.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _TRIANGULATE_H_
 #define _TRIANGULATE_H_
diff --git a/Plugin/Warp.cpp b/Plugin/Warp.cpp
index 7874da0dc4..a4558a6315 100644
--- a/Plugin/Warp.cpp
+++ b/Plugin/Warp.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Warp.h"
 #include "SmoothData.h"
diff --git a/Plugin/Warp.h b/Plugin/Warp.h
index 5a611cfbc8..5cb6c12828 100644
--- a/Plugin/Warp.h
+++ b/Plugin/Warp.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _WARP_H_
 #define _WARP_H_
diff --git a/Post/CMakeLists.txt b/Post/CMakeLists.txt
index b6bc8258b1..93b13d39c1 100644
--- a/Post/CMakeLists.txt
+++ b/Post/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   PView.cpp PViewIO.cpp PViewVertexArrays.cpp
diff --git a/Post/ColorTable.cpp b/Post/ColorTable.cpp
index a10f34fc3c..79016a34cc 100644
--- a/Post/ColorTable.cpp
+++ b/Post/ColorTable.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   David Colignon
diff --git a/Post/ColorTable.h b/Post/ColorTable.h
index d79f8a045a..9c5905214a 100644
--- a/Post/ColorTable.h
+++ b/Post/ColorTable.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _COLORTABLE_H_
 #define _COLORTABLE_H_
diff --git a/Post/OctreePost.cpp b/Post/OctreePost.cpp
index 6ae5a564c8..174fc10b2d 100644
--- a/Post/OctreePost.cpp
+++ b/Post/OctreePost.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "Octree.h"
 #include "OctreePost.h"
diff --git a/Post/OctreePost.h b/Post/OctreePost.h
index 7e74c2a6c4..ff7ddc0055 100644
--- a/Post/OctreePost.h
+++ b/Post/OctreePost.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OCTREE_POST_H_
 #define _OCTREE_POST_H_
diff --git a/Post/PView.cpp b/Post/PView.cpp
index 8bfee1bbc3..be9e1c2954 100644
--- a/Post/PView.cpp
+++ b/Post/PView.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <algorithm>
diff --git a/Post/PView.h b/Post/PView.h
index c44eb20db8..06eef510a6 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_H_
 #define _PVIEW_H_
diff --git a/Post/PViewAsSimpleFunction.cpp b/Post/PViewAsSimpleFunction.cpp
index ef8a946620..677ba97921 100644
--- a/Post/PViewAsSimpleFunction.cpp
+++ b/Post/PViewAsSimpleFunction.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "PView.h"
 #include "PViewData.h"
diff --git a/Post/PViewAsSimpleFunction.h b/Post/PViewAsSimpleFunction.h
index 2991b763f0..9fb511f2ec 100644
--- a/Post/PViewAsSimpleFunction.h
+++ b/Post/PViewAsSimpleFunction.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_AS_SIMPLEFUNCTION_H
 #define _PVIEW_AS_SIMPLEFUNCTION_H
diff --git a/Post/PViewData.cpp b/Post/PViewData.cpp
index c877b76754..903f860471 100644
--- a/Post/PViewData.cpp
+++ b/Post/PViewData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "PViewData.h"
 #include "adaptiveData.h"
diff --git a/Post/PViewData.h b/Post/PViewData.h
index 47f0c7cbc4..9a90bcd74f 100644
--- a/Post/PViewData.h
+++ b/Post/PViewData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_DATA_H_
 #define _PVIEW_DATA_H_
diff --git a/Post/PViewDataGModel.cpp b/Post/PViewDataGModel.cpp
index c8890625c5..4d6044ff09 100644
--- a/Post/PViewDataGModel.cpp
+++ b/Post/PViewDataGModel.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "PViewDataGModel.h"
 #include "MPoint.h"
diff --git a/Post/PViewDataGModel.h b/Post/PViewDataGModel.h
index 995be3c805..c15c818830 100644
--- a/Post/PViewDataGModel.h
+++ b/Post/PViewDataGModel.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_DATA_GMODEL_H_
 #define _PVIEW_DATA_GMODEL_H_
diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index a33ab4a914..7f56927ad3 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Post/PViewDataIO.cpp b/Post/PViewDataIO.cpp
index ec0e0d63d4..baf705ce83 100644
--- a/Post/PViewDataIO.cpp
+++ b/Post/PViewDataIO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdio.h>
 #include <string.h>
diff --git a/Post/PViewDataList.cpp b/Post/PViewDataList.cpp
index f2d9fedc98..8355487ea9 100644
--- a/Post/PViewDataList.cpp
+++ b/Post/PViewDataList.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <algorithm>
 #include "PViewDataList.h"
diff --git a/Post/PViewDataList.h b/Post/PViewDataList.h
index 5503d34ea0..9c1af06bd2 100644
--- a/Post/PViewDataList.h
+++ b/Post/PViewDataList.h
@@ -2,7 +2,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_DATA_LIST_H_
 #define _PVIEW_DATA_LIST_H_
diff --git a/Post/PViewDataListIO.cpp b/Post/PViewDataListIO.cpp
index 34a13da24b..29f6af1e6a 100644
--- a/Post/PViewDataListIO.cpp
+++ b/Post/PViewDataListIO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <set>
diff --git a/Post/PViewDataRemote.h b/Post/PViewDataRemote.h
index 71ecc766c7..0fcf3b2307 100644
--- a/Post/PViewDataRemote.h
+++ b/Post/PViewDataRemote.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_DATA_REMOTE_H_
 #define _PVIEW_DATA_REMOTE_H_
diff --git a/Post/PViewFactory.cpp b/Post/PViewFactory.cpp
index fcb0970f18..41e4f8f984 100644
--- a/Post/PViewFactory.cpp
+++ b/Post/PViewFactory.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "PViewFactory.h"
 #include "GModel.h"
diff --git a/Post/PViewFactory.h b/Post/PViewFactory.h
index 3cd6a887b7..2742e3718b 100644
--- a/Post/PViewFactory.h
+++ b/Post/PViewFactory.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_FACTORY_H_
 #define _PVIEW_FACTORY_H_
diff --git a/Post/PViewIO.cpp b/Post/PViewIO.cpp
index 134b5cd643..b2f1e8ebc9 100644
--- a/Post/PViewIO.cpp
+++ b/Post/PViewIO.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include "GmshMessage.h"
diff --git a/Post/PViewOptions.cpp b/Post/PViewOptions.cpp
index 91c8adcd08..3063fa645b 100644
--- a/Post/PViewOptions.cpp
+++ b/Post/PViewOptions.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "GmshConfig.h"
diff --git a/Post/PViewOptions.h b/Post/PViewOptions.h
index f1e27702ea..37cab72bcd 100644
--- a/Post/PViewOptions.h
+++ b/Post/PViewOptions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _PVIEW_OPTIONS_H_
 #define _PVIEW_OPTIONS_H_
diff --git a/Post/PViewVertexArrays.cpp b/Post/PViewVertexArrays.cpp
index 4eac9fdb9a..a83cb0658f 100644
--- a/Post/PViewVertexArrays.cpp
+++ b/Post/PViewVertexArrays.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include <algorithm>
diff --git a/Post/PViewX3D.cpp b/Post/PViewX3D.cpp
index 98834423c2..4ed575c05a 100644
--- a/Post/PViewX3D.cpp
+++ b/Post/PViewX3D.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // PViewX3D is a extension for Post-processing outputs :
 // creates a file in X3D format with the same features as
diff --git a/Post/PViewX3D.h b/Post/PViewX3D.h
index 31bee52f15..eada1ca8e1 100644
--- a/Post/PViewX3D.h
+++ b/Post/PViewX3D.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // PViewX3D is a extension for Post-processing outputs :
 // creates a file in X3D format with the same features as
diff --git a/Post/adaptiveData.cpp b/Post/adaptiveData.cpp
index 0e0f63d158..acec26b02d 100644
--- a/Post/adaptiveData.cpp
+++ b/Post/adaptiveData.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <math.h>
 #include <list>
diff --git a/Post/adaptiveData.h b/Post/adaptiveData.h
index 2789f1708e..1ede5e5edd 100644
--- a/Post/adaptiveData.h
+++ b/Post/adaptiveData.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ADAPTIVE_DATA_H_
 #define _ADAPTIVE_DATA_H_
diff --git a/Post/shapeFunctions.cpp b/Post/shapeFunctions.cpp
index 9bcdb82900..758f55c6b9 100644
--- a/Post/shapeFunctions.cpp
+++ b/Post/shapeFunctions.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "shapeFunctions.h"
 
diff --git a/Post/shapeFunctions.h b/Post/shapeFunctions.h
index 892fc3126a..98d68bacf4 100644
--- a/Post/shapeFunctions.h
+++ b/Post/shapeFunctions.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SHAPE_FUNCTIONS_H_
 #define _SHAPE_FUNCTIONS_H_
diff --git a/Qt/CMakeLists.txt b/Qt/CMakeLists.txt
index abbc07b78d..01142cb5f2 100644
--- a/Qt/CMakeLists.txt
+++ b/Qt/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   QGui.cpp
diff --git a/Qt/GLWidget.cpp b/Qt/GLWidget.cpp
index ba0b6add0b..00e7ccdb70 100644
--- a/Qt/GLWidget.cpp
+++ b/Qt/GLWidget.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <QtGui>
 #include <QtOpenGL>
diff --git a/Qt/GLWidget.h b/Qt/GLWidget.h
index 288214c949..830a9499bc 100644
--- a/Qt/GLWidget.h
+++ b/Qt/GLWidget.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GLWIDGET_H_
 #define _GLWIDGET_H_
diff --git a/Qt/Main.cpp b/Qt/Main.cpp
index 0ccfacc846..998a418c7b 100644
--- a/Qt/Main.cpp
+++ b/Qt/Main.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include "Gmsh.h"
diff --git a/Qt/QGui.cpp b/Qt/QGui.cpp
index 1f9d2632b6..a37284d231 100644
--- a/Qt/QGui.cpp
+++ b/Qt/QGui.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <QtGui>
 #include <QWidget>
diff --git a/Qt/QGui.h b/Qt/QGui.h
index 8c86c42378..a6af7c00fa 100644
--- a/Qt/QGui.h
+++ b/Qt/QGui.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _Q_GUI_H_
 #define _Q_GUI_H_
diff --git a/Qt/graphicWindow.cpp b/Qt/graphicWindow.cpp
index 8b5ebca7e8..c8783beafe 100644
--- a/Qt/graphicWindow.cpp
+++ b/Qt/graphicWindow.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <QtGui>
 #include "GLWidget.h"
diff --git a/Qt/graphicWindow.h b/Qt/graphicWindow.h
index a262062f5a..270d0cd978 100644
--- a/Qt/graphicWindow.h
+++ b/Qt/graphicWindow.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GRAPHIC_WINDOW_H_
 #define _GRAPHIC_WINDOW_H_
diff --git a/Solver/CMakeLists.txt b/Solver/CMakeLists.txt
index fc6ea3fb80..27296158c9 100644
--- a/Solver/CMakeLists.txt
+++ b/Solver/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   linearSystem.cpp
diff --git a/Solver/FuncGradDisc.h b/Solver/FuncGradDisc.h
index 2b4c177cd9..567a7dd9f0 100644
--- a/Solver/FuncGradDisc.h
+++ b/Solver/FuncGradDisc.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Boris Sedji
diff --git a/Solver/FuncHeaviside.h b/Solver/FuncHeaviside.h
index ea5fdda769..8f058b42a3 100644
--- a/Solver/FuncHeaviside.h
+++ b/Solver/FuncHeaviside.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Boris Sedji
diff --git a/Solver/SElement.cpp b/Solver/SElement.cpp
index 18ee69fde9..11aa405df4 100644
--- a/Solver/SElement.cpp
+++ b/Solver/SElement.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "SElement.h"
 
diff --git a/Solver/SElement.h b/Solver/SElement.h
index 3c9f8996c7..4bd42c2d73 100644
--- a/Solver/SElement.h
+++ b/Solver/SElement.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SELEMENT_H_
 #define _SELEMENT_H_
diff --git a/Solver/STensor33.cpp b/Solver/STensor33.cpp
index 46b6bcb03d..4887c8f67c 100644
--- a/Solver/STensor33.cpp
+++ b/Solver/STensor33.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/STensor33.h b/Solver/STensor33.h
index 70cadeebe6..f5aa5afeed 100644
--- a/Solver/STensor33.h
+++ b/Solver/STensor33.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/STensor43.cpp b/Solver/STensor43.cpp
index 3e92a00630..7948aa76b3 100644
--- a/Solver/STensor43.cpp
+++ b/Solver/STensor43.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/STensor43.h b/Solver/STensor43.h
index db60e77fe2..5e3372cc52 100644
--- a/Solver/STensor43.h
+++ b/Solver/STensor43.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/STensor53.cpp b/Solver/STensor53.cpp
index 25a9dbf9bc..6dd307d696 100644
--- a/Solver/STensor53.cpp
+++ b/Solver/STensor53.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "STensor53.h"
 
diff --git a/Solver/STensor53.h b/Solver/STensor53.h
index c1ec1d6170..559d349297 100644
--- a/Solver/STensor53.h
+++ b/Solver/STensor53.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 #ifndef STENSOR53_H_
 #define STENSOR53_H_
 
diff --git a/Solver/STensor63.cpp b/Solver/STensor63.cpp
index 6a09ef3411..724e41ed5b 100644
--- a/Solver/STensor63.cpp
+++ b/Solver/STensor63.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "STensor63.h"
 
diff --git a/Solver/STensor63.h b/Solver/STensor63.h
index 9e70a04de8..feb134e327 100644
--- a/Solver/STensor63.h
+++ b/Solver/STensor63.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 #ifndef STENSOR63_H_
 #define STENSOR63_H_
 
diff --git a/Solver/convexCombinationTerm.h b/Solver/convexCombinationTerm.h
index ecf7864bb0..6532d57d54 100644
--- a/Solver/convexCombinationTerm.h
+++ b/Solver/convexCombinationTerm.h
@@ -1,8 +1,7 @@
-
-// Gmsh - Copyright (C) 1997-2009 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CONVEX_COMBINATION_TERM_H_
 #define _CONVEX_COMBINATION_TERM_H_
@@ -27,8 +26,8 @@ class convexCombinationTerm : public femTerm<double> {
   {
     return se->getMeshElement()->getNumShapeFunctions();
   }
-  virtual int sizeOfC(SElement *se) const 
-  { 
+  virtual int sizeOfC(SElement *se) const
+  {
     return se->getMeshElement()->getNumShapeFunctions();
   }
   Dof getLocalDofR(SElement *se, int iRow) const
@@ -55,7 +54,7 @@ class convexCombinationTerm : public femTerm<double> {
 	  a = SVector3(vk->x()-vj->x(),vk->y()-vj->y(),vk->z()-vj->z());
 	  b = SVector3(vl->x()-vj->x(),vl->y()-vj->y(),vl->z()-vj->z());
 	  double angle = myacos(dot(a,b)/(norm(a)*norm(b)));
-	  tan = sin(angle*0.5)/cos(angle*0.5); 
+	  tan = sin(angle*0.5)/cos(angle*0.5);
 	}
 	double length  = vj->distance(vk);
 	m(j, k) = -tan/length; // mean value convex map
diff --git a/Solver/crossConfTerm.h b/Solver/crossConfTerm.h
index 13c4b91401..69b82cccec 100644
--- a/Solver/crossConfTerm.h
+++ b/Solver/crossConfTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _CROSS_CONF_TERM_H_
 #define _CROSS_CONF_TERM_H_
diff --git a/Solver/diagBCTerm.h b/Solver/diagBCTerm.h
index 5d3b698d09..f3239540a4 100644
--- a/Solver/diagBCTerm.h
+++ b/Solver/diagBCTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2009 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DIAGBC_TERM_H_
 #define _DIAGBC_TERM_H_
diff --git a/Solver/distanceTerm.h b/Solver/distanceTerm.h
index f0039e10b0..1c28e7fb2b 100644
--- a/Solver/distanceTerm.h
+++ b/Solver/distanceTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DISTANCE_TERM_H_
 #define _DISTANCE_TERM_H_
diff --git a/Solver/dofManager.cpp b/Solver/dofManager.cpp
index 3a3cc20d24..3c9d76aad2 100644
--- a/Solver/dofManager.cpp
+++ b/Solver/dofManager.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 
diff --git a/Solver/dofManager.h b/Solver/dofManager.h
index 484ab44af4..1ef5e5e4ac 100644
--- a/Solver/dofManager.h
+++ b/Solver/dofManager.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _DOF_MANAGER_H_
 #define _DOF_MANAGER_H_
diff --git a/Solver/eigenSolver.cpp b/Solver/eigenSolver.cpp
index 388a2cfb2e..f17d30e97d 100644
--- a/Solver/eigenSolver.cpp
+++ b/Solver/eigenSolver.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "eigenSolver.h"
 #include "OS.h"
diff --git a/Solver/eigenSolver.h b/Solver/eigenSolver.h
index e93d50fbe7..b0ffa023b3 100644
--- a/Solver/eigenSolver.h
+++ b/Solver/eigenSolver.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _EIGEN_SOLVER_H_
 #define _EIGEN_SOLVER_H_
diff --git a/Solver/elasticitySolver.cpp b/Solver/elasticitySolver.cpp
index 10574bb29f..be544939fc 100644
--- a/Solver/elasticitySolver.cpp
+++ b/Solver/elasticitySolver.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string.h>
 #include "GmshConfig.h"
diff --git a/Solver/elasticitySolver.h b/Solver/elasticitySolver.h
index 5a9f94f44e..16d69d3aaa 100644
--- a/Solver/elasticitySolver.h
+++ b/Solver/elasticitySolver.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ELASTICITY_SOLVER_H_
 #define _ELASTICITY_SOLVER_H_
diff --git a/Solver/elasticityTerm.cpp b/Solver/elasticityTerm.cpp
index 444c391aad..81c54127eb 100644
--- a/Solver/elasticityTerm.cpp
+++ b/Solver/elasticityTerm.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "elasticityTerm.h"
 #include "Numeric.h"
diff --git a/Solver/elasticityTerm.h b/Solver/elasticityTerm.h
index 893d7b2a8f..57293637f6 100644
--- a/Solver/elasticityTerm.h
+++ b/Solver/elasticityTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ELASTICITY_TERM_H_
 #define _ELASTICITY_TERM_H_
diff --git a/Solver/femTerm.h b/Solver/femTerm.h
index fe4816e8a9..8a7c7fb0e4 100644
--- a/Solver/femTerm.h
+++ b/Solver/femTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FEM_TERM_H_
 #define _FEM_TERM_H_
diff --git a/Solver/filters.cpp b/Solver/filters.cpp
index 345e70fdf2..f7fdf6805b 100644
--- a/Solver/filters.cpp
+++ b/Solver/filters.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Boris Sedji
diff --git a/Solver/filters.h b/Solver/filters.h
index e471ac3646..7a14fd197b 100644
--- a/Solver/filters.h
+++ b/Solver/filters.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Boris Sedji
diff --git a/Solver/frameSolver.h b/Solver/frameSolver.h
index 3e361741ff..453fb311d0 100644
--- a/Solver/frameSolver.h
+++ b/Solver/frameSolver.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FRAME_SOLVER_H_
 #define _FRAME_SOLVER_H_
diff --git a/Solver/functionSpace.cpp b/Solver/functionSpace.cpp
index 2165754b74..8118601657 100644
--- a/Solver/functionSpace.cpp
+++ b/Solver/functionSpace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/functionSpace.h b/Solver/functionSpace.h
index 3131d90b4b..4d3e7a2184 100644
--- a/Solver/functionSpace.h
+++ b/Solver/functionSpace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _FUNCTION_SPACE_H_
 #define _FUNCTION_SPACE_H_
diff --git a/Solver/groupOfElements.cpp b/Solver/groupOfElements.cpp
index 74785287b7..61b1393ad8 100644
--- a/Solver/groupOfElements.cpp
+++ b/Solver/groupOfElements.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "groupOfElements.h"
 #include "GModel.h"
diff --git a/Solver/groupOfElements.h b/Solver/groupOfElements.h
index c398223084..0561b31b9f 100644
--- a/Solver/groupOfElements.h
+++ b/Solver/groupOfElements.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _GROUPOFELEMENTS_H_
 #define _GROUPOFELEMENTS_H_
diff --git a/Solver/helmholtzTerm.h b/Solver/helmholtzTerm.h
index d4c819c445..44e064e743 100644
--- a/Solver/helmholtzTerm.h
+++ b/Solver/helmholtzTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _HELMHOLTZ_TERM_H_
 #define _HELMHOLTZ_TERM_H_
diff --git a/Solver/laplaceTerm.h b/Solver/laplaceTerm.h
index 6cc5b70483..66e367d536 100644
--- a/Solver/laplaceTerm.h
+++ b/Solver/laplaceTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LAPLACE_TERM_H_
 #define _LAPLACE_TERM_H_
diff --git a/Solver/linearSystem.cpp b/Solver/linearSystem.cpp
index 72fa396754..8601fa28ad 100644
--- a/Solver/linearSystem.cpp
+++ b/Solver/linearSystem.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "linearSystemFull.h"
 #include "linearSystemCSR.h"
diff --git a/Solver/linearSystem.h b/Solver/linearSystem.h
index 065298aab7..a2dca415ac 100644
--- a/Solver/linearSystem.h
+++ b/Solver/linearSystem.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_H_
 #define _LINEAR_SYSTEM_H_
diff --git a/Solver/linearSystemCSR.cpp b/Solver/linearSystemCSR.cpp
index 6a107e4983..1e73598062 100644
--- a/Solver/linearSystemCSR.cpp
+++ b/Solver/linearSystemCSR.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/Solver/linearSystemCSR.h b/Solver/linearSystemCSR.h
index 01662eb072..baa6b870bc 100644
--- a/Solver/linearSystemCSR.h
+++ b/Solver/linearSystemCSR.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_CSR_H_
 #define _LINEAR_SYSTEM_CSR_H_
diff --git a/Solver/linearSystemFull.h b/Solver/linearSystemFull.h
index 2624fbd7f0..173245dfa5 100644
--- a/Solver/linearSystemFull.h
+++ b/Solver/linearSystemFull.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_FULL_H_
 #define _LINEAR_SYSTEM_FULL_H_
diff --git a/Solver/linearSystemGMM.h b/Solver/linearSystemGMM.h
index c14e32c6c8..41da6e76ae 100644
--- a/Solver/linearSystemGMM.h
+++ b/Solver/linearSystemGMM.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_GMM_H_
 #define _LINEAR_SYSTEM_GMM_H_
diff --git a/Solver/linearSystemMUMPS.cpp b/Solver/linearSystemMUMPS.cpp
index ea8e327c5d..fe09aae114 100644
--- a/Solver/linearSystemMUMPS.cpp
+++ b/Solver/linearSystemMUMPS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 
 #include <stdio.h>
diff --git a/Solver/linearSystemMUMPS.h b/Solver/linearSystemMUMPS.h
index 951b8a7e0c..e8b953a5bb 100644
--- a/Solver/linearSystemMUMPS.h
+++ b/Solver/linearSystemMUMPS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_MUMPS_H_
 #define _LINEAR_SYSTEM_MUMPS_H_
diff --git a/Solver/linearSystemPETSc.cpp b/Solver/linearSystemPETSc.cpp
index b42fdb11bd..76db880392 100644
--- a/Solver/linearSystemPETSc.cpp
+++ b/Solver/linearSystemPETSc.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include "GmshConfig.h"
 #include <string.h>
diff --git a/Solver/linearSystemPETSc.h b/Solver/linearSystemPETSc.h
index e57ebcf840..df480e95b0 100644
--- a/Solver/linearSystemPETSc.h
+++ b/Solver/linearSystemPETSc.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _LINEAR_SYSTEM_PETSC_H_
 #define _LINEAR_SYSTEM_PETSC_H_
diff --git a/Solver/materialLaw.h b/Solver/materialLaw.h
index dafd2377d0..8072cb0068 100644
--- a/Solver/materialLaw.h
+++ b/Solver/materialLaw.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/multiscaleLaplace.cpp b/Solver/multiscaleLaplace.cpp
index 90386530dd..14b25fb6e3 100644
--- a/Solver/multiscaleLaplace.cpp
+++ b/Solver/multiscaleLaplace.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Emilie Marchandise
diff --git a/Solver/multiscaleLaplace.h b/Solver/multiscaleLaplace.h
index 61b9be3a20..b377456778 100644
--- a/Solver/multiscaleLaplace.h
+++ b/Solver/multiscaleLaplace.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _MULTISCALE_LAPLACE_H_
 #define _MULTISCALE_LAPLACE_H_
diff --git a/Solver/orthogonalTerm.h b/Solver/orthogonalTerm.h
index 43494c18ac..0ab0db9d2c 100644
--- a/Solver/orthogonalTerm.h
+++ b/Solver/orthogonalTerm.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ORTHOGONAL_TERM_H_
 #define _ORTHOGONAL_TERM_H_
diff --git a/Solver/quadratureRules.h b/Solver/quadratureRules.h
index 678616bef8..d6cece12af 100644
--- a/Solver/quadratureRules.h
+++ b/Solver/quadratureRules.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/solverAlgorithms.h b/Solver/solverAlgorithms.h
index 9aeb9155a0..f7be9c8c2c 100644
--- a/Solver/solverAlgorithms.h
+++ b/Solver/solverAlgorithms.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/solverField.h b/Solver/solverField.h
index 461b792568..68760d81e1 100644
--- a/Solver/solverField.h
+++ b/Solver/solverField.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/sparsityPattern.cpp b/Solver/sparsityPattern.cpp
index 358cb8af42..a88181b284 100644
--- a/Solver/sparsityPattern.cpp
+++ b/Solver/sparsityPattern.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Jonathan Lambrechts
diff --git a/Solver/sparsityPattern.h b/Solver/sparsityPattern.h
index 6e172d5954..334c291f45 100644
--- a/Solver/sparsityPattern.h
+++ b/Solver/sparsityPattern.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _SPARSITY_PATTERN_H_
 #define _SPARSITY_PATTERN_H_
diff --git a/Solver/terms.cpp b/Solver/terms.cpp
index 7a7ded8210..016b6fd63a 100644
--- a/Solver/terms.cpp
+++ b/Solver/terms.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/terms.h b/Solver/terms.h
index f1d62bd4f0..49e01eb2d5 100644
--- a/Solver/terms.h
+++ b/Solver/terms.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/terms.hpp b/Solver/terms.hpp
index e7f354cf48..7a2885a8ec 100644
--- a/Solver/terms.hpp
+++ b/Solver/terms.hpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   Eric Bechet
diff --git a/Solver/thermicSolver.cpp b/Solver/thermicSolver.cpp
index a3ef7885ff..d424017918 100644
--- a/Solver/thermicSolver.cpp
+++ b/Solver/thermicSolver.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to <gmsh@onelab.info>.
 
 #include <string.h>
 #include "GmshConfig.h"
diff --git a/Solver/thermicSolver.h b/Solver/thermicSolver.h
index 59c42456f0..2f715c9149 100644
--- a/Solver/thermicSolver.h
+++ b/Solver/thermicSolver.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
+// bugs and problems to <gmsh@onelab.info>.
 
 #ifndef _THERMIC_SOLVER_H_
 #define _THERMIC_SOLVER_H_
diff --git a/benchmarks/extrude_quadtri/READMEQUADTRI.txt b/benchmarks/extrude_quadtri/READMEQUADTRI.txt
index 6298e81b3f..2c5cf8e252 100644
--- a/benchmarks/extrude_quadtri/READMEQUADTRI.txt
+++ b/benchmarks/extrude_quadtri/READMEQUADTRI.txt
@@ -10,7 +10,7 @@ his contribution shall be cited appropriately.
 All code reused from Gmsh is Copyright (C) 1997-2013 C. Geuzaine, 
 J.-F. Remacle 
 
-Gmsh is available at: www.geuz.org/gmsh
+Gmsh is available at: www.gmsh.info
 
 See licensing information below.
 
diff --git a/benchmarks/extrude_quadtri/nico_torus.geo b/benchmarks/extrude_quadtri/nico_torus.geo
index e5fcdd3ecb..d243d04db6 100644
--- a/benchmarks/extrude_quadtri/nico_torus.geo
+++ b/benchmarks/extrude_quadtri/nico_torus.geo
@@ -1,5 +1,5 @@
 // This file was originally written by Nico Schloemer,
-// Citation: http://geuz.org/pipermail/gmsh/2012/007576.html
+// Citation: http://onelab.info/pipermail/gmsh/2012/007576.html
 
 //set options
 Geometry.Surfaces=1;
@@ -76,4 +76,4 @@ lcar = 0.05;
 orad = 0.5;
 irad = 0.15;
 zshift = 0.04;
-Call Torus;
\ No newline at end of file
+Call Torus;
diff --git a/contrib/ANN/CMakeLists.txt b/contrib/ANN/CMakeLists.txt
index 695d233118..0af8bb2499 100644
--- a/contrib/ANN/CMakeLists.txt
+++ b/contrib/ANN/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   src/ANN.cpp
diff --git a/contrib/Chaco/CMakeLists.txt b/contrib/Chaco/CMakeLists.txt
index f201444d61..fc28cb2689 100644
--- a/contrib/Chaco/CMakeLists.txt
+++ b/contrib/Chaco/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   main/Gmsh_printf.cpp main/Gmsh_exit.cpp
diff --git a/contrib/Chaco/main/Gmsh_exit.cpp b/contrib/Chaco/main/Gmsh_exit.cpp
index a150ff20c1..b032ce7704 100644
--- a/contrib/Chaco/main/Gmsh_exit.cpp
+++ b/contrib/Chaco/main/Gmsh_exit.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdexcept>
 
diff --git a/contrib/Chaco/main/Gmsh_exit.h b/contrib/Chaco/main/Gmsh_exit.h
index 431f5737b7..d8a5178202 100644
--- a/contrib/Chaco/main/Gmsh_exit.h
+++ b/contrib/Chaco/main/Gmsh_exit.h
@@ -1,7 +1,7 @@
 /* Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
  *
  * See the LICENSE.txt file for license information. Please report all
- * bugs and problems to the public mailing list <gmsh@geuz.org>.
+ * bugs and problems to the public mailing list <gmsh@onelab.info>.
  */
 #ifndef _GMSH_EXIT_H_
 #define _GMSH_EXIT_H_
diff --git a/contrib/Chaco/main/Gmsh_printf.cpp b/contrib/Chaco/main/Gmsh_printf.cpp
index c0aaa2709c..9cbb56beb9 100644
--- a/contrib/Chaco/main/Gmsh_printf.cpp
+++ b/contrib/Chaco/main/Gmsh_printf.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <cstdio>
 #include <cstring>
diff --git a/contrib/Chaco/main/Gmsh_printf.h b/contrib/Chaco/main/Gmsh_printf.h
index 8c85be8e38..318bff1496 100644
--- a/contrib/Chaco/main/Gmsh_printf.h
+++ b/contrib/Chaco/main/Gmsh_printf.h
@@ -1,7 +1,7 @@
 /* Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
  *
  * See the LICENSE.txt file for license information. Please report all
- * bugs and problems to the public mailing list <gmsh@geuz.org>.
+ * bugs and problems to the public mailing list <gmsh@onelab.info>.
  */
 #ifndef _GMSH_PRINTF_H_
 #define _GMSH_PRINTF_H_
diff --git a/contrib/DiscreteIntegration/CMakeLists.txt b/contrib/DiscreteIntegration/CMakeLists.txt
index e9ff36c0cc..8e557a02da 100644
--- a/contrib/DiscreteIntegration/CMakeLists.txt
+++ b/contrib/DiscreteIntegration/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Integration3D.cpp
diff --git a/contrib/HighOrderMeshOptimizer/CMakeLists.txt b/contrib/HighOrderMeshOptimizer/CMakeLists.txt
index 6c62397154..559fc502ff 100644
--- a/contrib/HighOrderMeshOptimizer/CMakeLists.txt
+++ b/contrib/HighOrderMeshOptimizer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   OptHomMesh.cpp 
diff --git a/contrib/HighOrderMeshOptimizer/OptHOM.cpp b/contrib/HighOrderMeshOptimizer/OptHOM.cpp
index 3200e1bd2f..ca081c94cd 100644
--- a/contrib/HighOrderMeshOptimizer/OptHOM.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHOM.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHOM.h b/contrib/HighOrderMeshOptimizer/OptHOM.h
index 7e1c614489..179e19be2a 100644
--- a/contrib/HighOrderMeshOptimizer/OptHOM.h
+++ b/contrib/HighOrderMeshOptimizer/OptHOM.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp b/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp
index de791fef05..88c14d74fe 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #include "OptHomElastic.h"
 #include "GModel.h"
diff --git a/contrib/HighOrderMeshOptimizer/OptHomElastic.h b/contrib/HighOrderMeshOptimizer/OptHomElastic.h
index 2295e4eeec..58ef5a83f0 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomElastic.h
+++ b/contrib/HighOrderMeshOptimizer/OptHomElastic.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _OPT_HOM_ELASTIC_H_
 #define _OPT_HOM_ELASTIC_H_
diff --git a/contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp b/contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp
index 58b9df9bc2..34c59b566c 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomFastCurving.h b/contrib/HighOrderMeshOptimizer/OptHomFastCurving.h
index 9b114915da..7fd62f20be 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomFastCurving.h
+++ b/contrib/HighOrderMeshOptimizer/OptHomFastCurving.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp b/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp
index dbea55ed27..9ffdebb4e0 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomMesh.h b/contrib/HighOrderMeshOptimizer/OptHomMesh.h
index 696a19b0c2..8ccdd35e45 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomMesh.h
+++ b/contrib/HighOrderMeshOptimizer/OptHomMesh.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
index 87844e29c5..dfe512dae4 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/OptHomRun.h b/contrib/HighOrderMeshOptimizer/OptHomRun.h
index df3e460161..88b162e250 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomRun.h
+++ b/contrib/HighOrderMeshOptimizer/OptHomRun.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/ParamCoord.cpp b/contrib/HighOrderMeshOptimizer/ParamCoord.cpp
index 88125af7f3..579dccd4c1 100644
--- a/contrib/HighOrderMeshOptimizer/ParamCoord.cpp
+++ b/contrib/HighOrderMeshOptimizer/ParamCoord.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributor(s): Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/ParamCoord.h b/contrib/HighOrderMeshOptimizer/ParamCoord.h
index a0bb4f597e..e8a6cd84f7 100644
--- a/contrib/HighOrderMeshOptimizer/ParamCoord.h
+++ b/contrib/HighOrderMeshOptimizer/ParamCoord.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/HighOrderMeshOptimizer/SuperEl.cpp b/contrib/HighOrderMeshOptimizer/SuperEl.cpp
index d7ec149660..845c548d93 100644
--- a/contrib/HighOrderMeshOptimizer/SuperEl.cpp
+++ b/contrib/HighOrderMeshOptimizer/SuperEl.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributor: Thomas Toulorge
 
diff --git a/contrib/HighOrderMeshOptimizer/SuperEl.h b/contrib/HighOrderMeshOptimizer/SuperEl.h
index b360495176..180c013b12 100644
--- a/contrib/HighOrderMeshOptimizer/SuperEl.h
+++ b/contrib/HighOrderMeshOptimizer/SuperEl.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributor: Thomas Toulorge
 
diff --git a/contrib/MathEx/CMakeLists.txt b/contrib/MathEx/CMakeLists.txt
index e73d5cf485..8f3964f110 100644
--- a/contrib/MathEx/CMakeLists.txt
+++ b/contrib/MathEx/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   mathex.cpp
diff --git a/contrib/MeshOptimizer/CMakeLists.txt b/contrib/MeshOptimizer/CMakeLists.txt
index c1ae9d7b6c..0b185d9a22 100644
--- a/contrib/MeshOptimizer/CMakeLists.txt
+++ b/contrib/MeshOptimizer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   MeshOpt.cpp
diff --git a/contrib/MeshOptimizer/MeshOpt.cpp b/contrib/MeshOptimizer/MeshOpt.cpp
index abc73e7b08..4112cb91ad 100644
--- a/contrib/MeshOptimizer/MeshOpt.cpp
+++ b/contrib/MeshOptimizer/MeshOpt.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOpt.h b/contrib/MeshOptimizer/MeshOpt.h
index d132bb9410..737b854988 100644
--- a/contrib/MeshOptimizer/MeshOpt.h
+++ b/contrib/MeshOptimizer/MeshOpt.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptCommon.cpp b/contrib/MeshOptimizer/MeshOptCommon.cpp
index 62ff7b0177..5a9f787905 100644
--- a/contrib/MeshOptimizer/MeshOptCommon.cpp
+++ b/contrib/MeshOptimizer/MeshOptCommon.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptCommon.h b/contrib/MeshOptimizer/MeshOptCommon.h
index 232fd359c2..900d35127b 100644
--- a/contrib/MeshOptimizer/MeshOptCommon.h
+++ b/contrib/MeshOptimizer/MeshOptCommon.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptPatch.cpp b/contrib/MeshOptimizer/MeshOptPatch.cpp
index 1aff778db4..47d6df65c2 100644
--- a/contrib/MeshOptimizer/MeshOptPatch.cpp
+++ b/contrib/MeshOptimizer/MeshOptPatch.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptPatch.h b/contrib/MeshOptimizer/MeshOptPatch.h
index baa3b0b7b2..5c482de325 100644
--- a/contrib/MeshOptimizer/MeshOptPatch.h
+++ b/contrib/MeshOptimizer/MeshOptPatch.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptVertexCoord.cpp b/contrib/MeshOptimizer/MeshOptVertexCoord.cpp
index 073e97ce21..a4bf6853ac 100644
--- a/contrib/MeshOptimizer/MeshOptVertexCoord.cpp
+++ b/contrib/MeshOptimizer/MeshOptVertexCoord.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributor(s): Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptVertexCoord.h b/contrib/MeshOptimizer/MeshOptVertexCoord.h
index 3a1c00df06..5094f220f1 100644
--- a/contrib/MeshOptimizer/MeshOptVertexCoord.h
+++ b/contrib/MeshOptimizer/MeshOptVertexCoord.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptimizer.cpp b/contrib/MeshOptimizer/MeshOptimizer.cpp
index 924081d243..5754127c59 100644
--- a/contrib/MeshOptimizer/MeshOptimizer.cpp
+++ b/contrib/MeshOptimizer/MeshOptimizer.cpp
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshOptimizer/MeshOptimizer.h b/contrib/MeshOptimizer/MeshOptimizer.h
index b3ed8940a2..76a6690481 100644
--- a/contrib/MeshOptimizer/MeshOptimizer.h
+++ b/contrib/MeshOptimizer/MeshOptimizer.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/MeshQualityOptimizer/CMakeLists.txt b/contrib/MeshQualityOptimizer/CMakeLists.txt
index d8ddd3a30e..f68e993e2b 100644
--- a/contrib/MeshQualityOptimizer/CMakeLists.txt
+++ b/contrib/MeshQualityOptimizer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   MeshQualityOptimizer.cpp
diff --git a/contrib/MeshQualityOptimizer/MeshQualityOptimizer.h b/contrib/MeshQualityOptimizer/MeshQualityOptimizer.h
index 3959e04834..630bd3f90d 100644
--- a/contrib/MeshQualityOptimizer/MeshQualityOptimizer.h
+++ b/contrib/MeshQualityOptimizer/MeshQualityOptimizer.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 //
 // Contributors: Thomas Toulorge, Jonathan Lambrechts
 
diff --git a/contrib/Metis/CMakeLists.txt b/contrib/Metis/CMakeLists.txt
index 819d81a4b4..84d1c1a2e7 100644
--- a/contrib/Metis/CMakeLists.txt
+++ b/contrib/Metis/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   balance.c 
diff --git a/contrib/Netgen/CMakeLists.txt b/contrib/Netgen/CMakeLists.txt
index c8d4177d31..1d2d6dbce7 100644
--- a/contrib/Netgen/CMakeLists.txt
+++ b/contrib/Netgen/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(gen libsrc/general)
 set(lin libsrc/linalg)
diff --git a/contrib/Salome/CMakeLists.txt b/contrib/Salome/CMakeLists.txt
index 94faae2784..456bc195fc 100644
--- a/contrib/Salome/CMakeLists.txt
+++ b/contrib/Salome/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Partition_Inter2d.cxx 
diff --git a/contrib/Tetgen1.4/CMakeLists.txt b/contrib/Tetgen1.4/CMakeLists.txt
index 89e275c358..6b1004a40a 100644
--- a/contrib/Tetgen1.4/CMakeLists.txt
+++ b/contrib/Tetgen1.4/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   tetgen.cxx
diff --git a/contrib/Tetgen1.5/CMakeLists.txt b/contrib/Tetgen1.5/CMakeLists.txt
index c2a041cefc..5dedb56984 100644
--- a/contrib/Tetgen1.5/CMakeLists.txt
+++ b/contrib/Tetgen1.5/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   tetgen.cxx
diff --git a/contrib/bamg/CMakeLists.txt b/contrib/bamg/CMakeLists.txt
index 264b03b7a3..735a65b33a 100644
--- a/contrib/bamg/CMakeLists.txt
+++ b/contrib/bamg/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   Mesh2d.cpp 
diff --git a/contrib/blossom/CMakeLists.txt b/contrib/blossom/CMakeLists.txt
index 04ba49fde2..a67be0ea67 100644
--- a/contrib/blossom/CMakeLists.txt
+++ b/contrib/blossom/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
 # concorde97/BIGGUY/bg_test.c
diff --git a/contrib/kbipack/CMakeLists.txt b/contrib/kbipack/CMakeLists.txt
index 81c8887687..fa4c497aef 100644
--- a/contrib/kbipack/CMakeLists.txt
+++ b/contrib/kbipack/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   gmp_normal_form.cpp
diff --git a/contrib/mmg3d/CMakeLists.txt b/contrib/mmg3d/CMakeLists.txt
index fb8ab2938f..4749f834de 100644
--- a/contrib/mmg3d/CMakeLists.txt
+++ b/contrib/mmg3d/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
 ./build/sources/mmg3d.c
diff --git a/contrib/mobile/androidUtils.cpp b/contrib/mobile/androidUtils.cpp
index 86e8682db5..5d62f459ca 100644
--- a/contrib/mobile/androidUtils.cpp
+++ b/contrib/mobile/androidUtils.cpp
@@ -314,8 +314,8 @@ extern "C" {
             << "Version " << GMSH_VERSION << " "
             << "(<i>Build date:</i> " << GMSH_DATE << ")"
             << "<p>Copyright (C) 1997-2015 Christophe Geuzaine and Jean-Fran&ccedil;ois Remacle</p>"
-            << "<p><a href=\"http://geuz.org/gmsh/doc/CREDITS.txt\">Credits</a> "
-            << "and <a href=\"http://geuz.org/gmsh/doc/LICENSE.txt\">licensing information</a></p>"
+            << "<p><a href=\"http://gmsh.info/doc/CREDITS.txt\">Credits</a> "
+            << "and <a href=\"http://gmsh.info/doc/LICENSE.txt\">licensing information</a></p>"
             << "<p><i>Build options:</i> " << GMSH_CONFIG_OPTIONS << "</p>"
             << "<p>Visit <a href=\"http://gmsh.info\">http://gmsh.info</a> for more information</p></center>";
     return env->NewStringUTF(sstream.str().c_str());
@@ -328,8 +328,8 @@ extern "C" {
             << "Version " << GETDP_VERSION << " "
             << "(<i>Build date:</i> " << GETDP_DATE << ")"
             << "<p>Copyright (C) 1997-2015 Patrick Dular and Christophe Geuzaine, University of Li&egrave;ge</p>"
-            << "<p><a href=\"http://geuz.org/getdp/doc/CREDITS.txt\">Credits</a> "
-            << "and <a href=\"http://geuz.org/getdp/doc/LICENSE.txt\">licensing information</a></p>"
+            << "<p><a href=\"http://getdp.info/doc/CREDITS.txt\">Credits</a> "
+            << "and <a href=\"http://getdp.info/doc/LICENSE.txt\">licensing information</a></p>"
             << "<p><i>Build options:</i> " << GETDP_CONFIG_OPTIONS << "</p>"
             << "<p>Visit <a href=\"http://getdp.info\">http://getdp.info</a> for more information</p></center>";
     return env->NewStringUTF(sstream.str().c_str());
diff --git a/contrib/mpeg_encode/CMakeLists.txt b/contrib/mpeg_encode/CMakeLists.txt
index 7977a78e81..7c6426b605 100644
--- a/contrib/mpeg_encode/CMakeLists.txt
+++ b/contrib/mpeg_encode/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   bframe.cpp
diff --git a/contrib/onelab/CMakeLists.txt b/contrib/onelab/CMakeLists.txt
index 369ffd1c8c..b9ed98da34 100644
--- a/contrib/onelab/CMakeLists.txt
+++ b/contrib/onelab/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   OnelabClients.cpp 
diff --git a/contrib/onelab/OnelabClients.h b/contrib/onelab/OnelabClients.h
index e43e6355c1..ed96596b68 100644
--- a/contrib/onelab/OnelabClients.h
+++ b/contrib/onelab/OnelabClients.h
@@ -1,7 +1,7 @@
 // ONELAB - Copyright (C) 2010-2012 C. Geuzaine, F. Henrotte
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ONELAB_CLIENTS_H_
 #define _ONELAB_CLIENTS_H_
diff --git a/contrib/onelab/OnelabMessage.cpp b/contrib/onelab/OnelabMessage.cpp
index e078cdec8e..e73e005ff4 100644
--- a/contrib/onelab/OnelabMessage.cpp
+++ b/contrib/onelab/OnelabMessage.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/contrib/onelab/OnelabMessage.h b/contrib/onelab/OnelabMessage.h
index 383afe7991..2a56043ac0 100644
--- a/contrib/onelab/OnelabMessage.h
+++ b/contrib/onelab/OnelabMessage.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2012 C. Geuzaine, F. Henrotte
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _ONELAB_MESSAGE_H_
 #define _ONELAB_MESSAGE_H_
diff --git a/contrib/onelab/metamodel.h b/contrib/onelab/metamodel.h
index 27e1e87d39..ec3b97a069 100644
--- a/contrib/onelab/metamodel.h
+++ b/contrib/onelab/metamodel.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2012 C. Geuzaine, F. Henrotte
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #include <string>
 
diff --git a/contrib/onelab/myOS.cpp b/contrib/onelab/myOS.cpp
index fb5d3d5fd5..2a2ff766f8 100644
--- a/contrib/onelab/myOS.cpp
+++ b/contrib/onelab/myOS.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 // This file contains a bunch of functions that depend on OS-dependent
 // features and/or system calls
diff --git a/contrib/onelab/myOS.h b/contrib/onelab/myOS.h
index a685f8a957..615857beb0 100644
--- a/contrib/onelab/myOS.h
+++ b/contrib/onelab/myOS.h
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 #ifndef _OS_H_
 #define _OS_H_
diff --git a/contrib/onelab/python/onelab.py b/contrib/onelab/python/onelab.py
index 3d0d08c674..7dc106fbe4 100755
--- a/contrib/onelab/python/onelab.py
+++ b/contrib/onelab/python/onelab.py
@@ -24,7 +24,7 @@ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 OF THIS SOFTWARE.
 
 Please report all bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 """
 
 import socket, struct, os, sys, subprocess, time
diff --git a/contrib/onelab2/python/onelab2.py b/contrib/onelab2/python/onelab2.py
index 7397f85add..b97ac7e5e9 100755
--- a/contrib/onelab2/python/onelab2.py
+++ b/contrib/onelab2/python/onelab2.py
@@ -24,7 +24,7 @@ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 OF THIS SOFTWARE.
 
 Please report all bugs and problems to the public mailing list
-<gmsh@geuz.org>.
+<gmsh@onelab.info>.
 """
 
 import socket, struct, os, sys, subprocess
diff --git a/contrib/taucs/CMakeLists.txt b/contrib/taucs/CMakeLists.txt
index 7bbda2e12e..c977af31d7 100644
--- a/contrib/taucs/CMakeLists.txt
+++ b/contrib/taucs/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 # contributor : Jonathan Lambrechts
 
diff --git a/contrib/zipper/CMakeLists.txt b/contrib/zipper/CMakeLists.txt
index 45ef830a73..5a6a149ff9 100644
--- a/contrib/zipper/CMakeLists.txt
+++ b/contrib/zipper/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SRC
   zip.c
diff --git a/doc/gmsh.html b/doc/gmsh.html
index cea2eeb054..a7e1fafcd3 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -177,19 +177,19 @@ algorithms</a>.
   <li><a href="doc/VERSIONS.txt">Version history</a>
   <li>Mailing lists:
     <ul>
-      <li><a href="http://geuz.org/mailman/listinfo/gmsh/">gmsh</a>
-        (archived <a href="http://geuz.org/pipermail/gmsh/">here</a>) is the public
+      <li><a href="http://onelab.info/mailman/listinfo/gmsh/">gmsh</a>
+        (archived <a href="http://onelab.info/pipermail/gmsh/">here</a>) is the public
         mailing list for Gmsh discussions, and is the best place to
         ask questions (and get answers!)
-      <li><a href="http://geuz.org/mailman/listinfo/gmsh-announce/">gmsh-announce</a> (archived
-        <a href="http://geuz.org/pipermail/gmsh-announce/">here</a>) is a moderated
+      <li><a href="http://onelab.info/mailman/listinfo/gmsh-announce/">gmsh-announce</a> (archived
+        <a href="http://onelab.info/pipermail/gmsh-announce/">here</a>) is a moderated
         ("read-only") list for announcements about new releases and
         other Gmsh news
     </ul>
 </ul>
 
 <p>
-Please use the public mailing list <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org</a>
+Please use the public mailing list <a HREF="mailto:gmsh@onelab.info">gmsh@onelab.info</a>
 to send questions or ask for help. If you think you have found a bug in the
 program, you can file a report directly
 <a href="https://onelab.info/trac/gmsh/newticket" data-tooltip=
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 878fabb6fa..eb171dcad9 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -2,7 +2,7 @@
 @c Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 @c
 @c See the LICENSE.txt file for license information. Please report all
-@c bugs and problems to the public mailing list <gmsh@geuz.org>.
+@c bugs and problems to the public mailing list <gmsh@onelab.info>.
 @c
 @c =========================================================================
 @c
diff --git a/utils/api_demos/mainHomology.cpp b/utils/api_demos/mainHomology.cpp
index dc20038f41..7f7428ee5b 100644
--- a/utils/api_demos/mainHomology.cpp
+++ b/utils/api_demos/mainHomology.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributed by Matti Pellikka <matti.pellikka@tut.fi>.
 //
diff --git a/utils/converters/autocad/dxf2geo.cpp b/utils/converters/autocad/dxf2geo.cpp
index a7af2d4872..93b7d90fa2 100644
--- a/utils/converters/autocad/dxf2geo.cpp
+++ b/utils/converters/autocad/dxf2geo.cpp
@@ -1,7 +1,7 @@
 // Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
-// bugs and problems to the public mailing list <gmsh@geuz.org>.
+// bugs and problems to the public mailing list <gmsh@onelab.info>.
 //
 // Contributor(s):
 //   David Colignon
diff --git a/utils/converters/autocad/dxf2msh.c b/utils/converters/autocad/dxf2msh.c
index 26a772259e..300d7ee439 100644
--- a/utils/converters/autocad/dxf2msh.c
+++ b/utils/converters/autocad/dxf2msh.c
@@ -1,13 +1,13 @@
 /* $Id: dxf2msh.c,v 1.1 2003-05-09 21:58:54 geuzaine Exp $ */
 
-/* 
+/*
    AutoCAD DXF to GMSH .msh Data File Converter
 
    David.Colignon@AdValvas.be
-   
+
    This is a hack from the Autocad DXF to DKB .Data file translator Version 1.0
    written by Aaron A. Collins (8/13/90) ( http://www.sdsc.edu/~mjb/mae152/dxf.spec.txt )
-   and from dxf2geo by Christophe Geuzaine ( http://www.geuz.org/gmsh )
+   and from dxf2geo by Christophe Geuzaine ( http://www.gmsh.info )
 
 */
 
@@ -25,7 +25,7 @@ FILE    *infile, *outfile ;
 char    inname[80], outname[80], curobj[80], linbuf[BUFSIZE];
 int     i, groupcode, num_p=1 , num_l=1 , num_tt=1 ;
 int     cpt_p=1, nb_p, *new_num_pt, cpt_l=1, nb_l, *new_num_l ;
-int     nb_tt, sl , *List_Fa_1, *List_Fa_2 , *Test_ori ; 
+int     nb_tt, sl , *List_Fa_1, *List_Fa_2 , *Test_ori ;
 float   xc[10], yc[10], zc[10], angles[10], baryx=0., baryy=0., baryz=0. ;
 float   THETOL=0.0000000001 ;
 Tree_T  *Point_T , *Line_T , *Facet_T , *arXfa_T ;
@@ -75,12 +75,12 @@ void WritePoint(void *a, void *b)
 {
   struct Point *p ;
   p = (struct Point *) a ;
-  fprintf(outfile, "%d %.6f %.6f %.6f\n", 
+  fprintf(outfile, "%d %.6f %.6f %.6f\n",
 	  new_num_pt[p->num], (p->x)-baryx, (p->y)-baryy, (p->z)-baryz) ;
 }
 
 struct Line {
-  int num, a, b ; 
+  int num, a, b ;
 } ;
 
 int fcmpLine (const void *a, const void *b)
@@ -130,7 +130,7 @@ void WriteLine(void *a, void *b)
 }
 
 struct  arXfa {
-  int num_ar, num_el[3] ; 
+  int num_ar, num_el[3] ;
 } ;
 
 int fcmparXfa (const void *a, const void *b)
@@ -190,12 +190,12 @@ void WriteFacet(void *a, void *b)
   } else {
   fprintf(outfile, "%d 3 99 0 4 %d %d %d %d\n",
 	  t->num+nb_l, new_num_pt[t->p[0]], new_num_pt[t->p[1]], new_num_pt[t->p[2]], new_num_pt[t->p[3]]) ;
- 
+
   }
 }
 
 // **********************************************************************************************
-void orienttri_3 ( int Edgs , int Tgl , int Tgll ) 
+void orienttri_3 ( int Edgs , int Tgl , int Tgll )
 {
   struct Facet tri_0 , *tri_a , *tri_b ;
   int ii , mm  , numa , numb ;
@@ -230,9 +230,9 @@ void orienttri_2 (int N1 )
     Tgl=List_Fa_1[I-1];
     tri_0.num = Tgl ;
     tri_a = (struct Facet*)Tree_PQuery(Facet_T, &tri_0) ;
-    nbar = tri_a->nbar ; 
+    nbar = tri_a->nbar ;
     for (IEdgs=1 ; IEdgs <=nbar ; IEdgs++) { // pour chaque arete de la face
-      Edgs = tri_a->ar[IEdgs-1] ; 
+      Edgs = tri_a->ar[IEdgs-1] ;
       arXfa_0.num_ar = Edgs ;
       arXfa_b = (struct arXfa*)Tree_PQuery(arXfa_T, &arXfa_0) ;
       for (Mult=1 ; Mult<=3 ; Mult++) { // pour 3 faces possibles ayant cette arete
@@ -241,14 +241,14 @@ void orienttri_2 (int N1 )
 	  //printf("Tgll  %d  Test_ori[Tgll-1]  %d\n",Tgll,Test_ori[Tgll-1]);
 	  N2 = N2+1 ;
 	  List_Fa_2[N2-1] = Tgll ;
-	  orienttri_3( Edgs , Tgl , Tgll ) ; 
+	  orienttri_3( Edgs , Tgl , Tgll ) ;
 	  Test_ori[Tgll-1] = 1 ;
 	}
       }
     }
   }
   for ( I=1 ; I<=N2 ; I++ ) {
-    List_Fa_1[I-1] = List_Fa_2[I-1] ; 
+    List_Fa_1[I-1] = List_Fa_2[I-1] ;
   }
   N1 = N2 ;
   //if (N2!=0) printf("Longueur List_Fa2 = %d \n",N2) ;
@@ -265,14 +265,14 @@ void orienttri_1 (void )
   }
   N1 = 1 ;
   List_Fa_1[1-1] = 1 ;
-  Test_ori[1-1] = 1 ; 
+  Test_ori[1-1] = 1 ;
   orienttri_2(N1) ;
   for ( ii=2 ; ii<=nb_tt ; ii++ ) {
     if ( Test_ori[ii-1] == 0 ) {
       //printf("!!! Warning : Facet number %d not previously reached. New independent surface ?\n",ii);
-      N1 = 1 ; 
+      N1 = 1 ;
       List_Fa_1[1-1] = ii ;
-      Test_ori[ii-1] = 1 ; 
+      Test_ori[ii-1] = 1 ;
       orienttri_2(N1) ;
     }
   }
@@ -284,13 +284,13 @@ void orienttri_1 (void )
 
 
 void Addobj(void) /* dump out current object we should have all info on */
-{ 
-  struct Point      p ; 
+{
+  struct Point      p ;
   struct Line       l ;
   struct Facet      t ;
   struct arXfa      arXfa_cur ;
   int   ii , nump[4] , numl[4] , sel[4] ;
-  float det[4] ; 
+  float det[4] ;
 
   if (strstr(curobj, "POINT")){
     p.x = xc[0] ; p.y = yc[0] ; p.z = zc[0] ; AddPoint(&p) ;
@@ -300,17 +300,17 @@ void Addobj(void) /* dump out current object we should have all info on */
     if (xc[0]==xc[1] && yc[0]==yc[1] && zc[0]==zc[1]) {
       printf("!!! Warning : zero-length line in (3D)LINE removed !!!\n") ;
       return;
-    } 
+    }
     p.x = xc[0] ; p.y = yc[0] ; p.z = zc[0] ; nump[0] = AddPoint(&p) ;
     p.x = xc[1] ; p.y = yc[1] ; p.z = zc[1] ; nump[1] = AddPoint(&p) ;
     l.a = nump[0] ; l.b = nump[1] ; AddLine(&l) ;
 
-  } else if (strstr(curobj, "3DFACE")){ 
+  } else if (strstr(curobj, "3DFACE")){
 
-    det[0] =    (((yc[1]-yc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(yc[2]-yc[0]))) ; 
-    det[1] = -1*(((xc[1]-xc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(xc[2]-xc[0]))) ; 
-    det[2] =    (((xc[1]-xc[0])*(yc[2]-yc[0]))-((yc[1]-yc[0])*(xc[2]-xc[0]))) ; 
-    det[3] = sqrt ( det[0]*det[0]+det[1]*det[1]+det[2]*det[2] ) ; 
+    det[0] =    (((yc[1]-yc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(yc[2]-yc[0]))) ;
+    det[1] = -1*(((xc[1]-xc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(xc[2]-xc[0]))) ;
+    det[2] =    (((xc[1]-xc[0])*(yc[2]-yc[0]))-((yc[1]-yc[0])*(xc[2]-xc[0]))) ;
+    det[3] = sqrt ( det[0]*det[0]+det[1]*det[1]+det[2]*det[2] ) ;
    if (xc[3] == xc[2] && yc[3] == yc[2] && zc[3] == zc[2]) {
       if ( det[3] == 0. ) {
 	printf("!!! WARNING : Degenerate triangular 3DFACE (colinear points) removed !!!\n") ;
@@ -320,12 +320,12 @@ void Addobj(void) /* dump out current object we should have all info on */
 
       if (xc[3] == xc[0] && yc[3] == yc[0] && zc[3] == zc[0]) {
 	printf("!!! WARNING : Degenerate quadrangular 3DFACE converted in triangle !!!\n") ;
-	xc[3] = xc[2] ; yc[3] = yc[2] ; zc[3] = zc[2] ; 
+	xc[3] = xc[2] ; yc[3] = yc[2] ; zc[3] = zc[2] ;
       }
     }
      for ( ii=0 ; ii<=2 ; ii++ ) {
       p.x = xc[ii] ; p.y = yc[ii] ; p.z = zc[ii] ; nump[ii] = AddPoint(&p) ;
-      t.no[ii] = det[ii]/det[3] ; 
+      t.no[ii] = det[ii]/det[3] ;
     }
     l.a = nump[0] ; l.b = nump[1] ; numl[0] = AddLine(&l) ; sel[0] = sl ;
     arXfa_cur.num_ar = numl[0] ; AddarXfa(&arXfa_cur) ;
@@ -333,30 +333,30 @@ void Addobj(void) /* dump out current object we should have all info on */
     arXfa_cur.num_ar = numl[1] ; AddarXfa(&arXfa_cur) ;
 
     if (xc[3] == xc[2] && yc[3] == yc[2] && zc[3] == zc[2]){
-      t.nbar = 3 ; 
+      t.nbar = 3 ;
       l.a = nump[2] ; l.b = nump[0] ; numl[2] = AddLine(&l) ; sel[2] = sl ;
       arXfa_cur.num_ar = numl[2] ; AddarXfa(&arXfa_cur) ;
       nump[3] = 0 ; numl[3] = 0 ; sel[3] = 0 ; // fausse 4eme arete
     } else {
       t.nbar = 4 ;
       p.x = xc[3] ; p.y = yc[3] ; p.z = zc[3] ; nump[3] = AddPoint(&p) ;
-      l.a = nump[2] ; l.b = nump[3] ; numl[2] = AddLine(&l) ; sel[2] = sl ; 
+      l.a = nump[2] ; l.b = nump[3] ; numl[2] = AddLine(&l) ; sel[2] = sl ;
       arXfa_cur.num_ar = numl[2] ; AddarXfa(&arXfa_cur) ;
       l.a = nump[3] ; l.b = nump[0] ; numl[3] = AddLine(&l) ; sel[3] = sl ;
       arXfa_cur.num_ar = numl[3] ; AddarXfa(&arXfa_cur) ;
     }
     for ( ii=0 ; ii<=3 ; ii++ ) {
-      t.ar[ii] = numl[ii] ; 
+      t.ar[ii] = numl[ii] ;
       t.s[ii] = sel[ii] ;
       t.p[ii] = nump[ii] ;
     }
-    t.ori = 1 ; 
+    t.ori = 1 ;
     AddFacet(&t) ;
   }
 }
 
 int getline(void) /* read a group code and the next line from infile */
-{ 
+{
   fgets(linbuf, BUFSIZE, infile); /* get a line from .DXF */
   if (feof(infile))
     return(1);
@@ -377,8 +377,8 @@ int main(int argc, char *argv[])
     }
     THETOL = atof(argv[2]) ;
   */
-  printf("\nAutoCAD DXF to Emc2000Flash .Geom Data File Converter\n") ; 
-  printf("by David Colignon ( David.Colignon@AdValvas.be )\n\n") ; 
+  printf("\nAutoCAD DXF to Emc2000Flash .Geom Data File Converter\n") ;
+  printf("by David Colignon ( David.Colignon@AdValvas.be )\n\n") ;
 
   strcpy(inname, argv[1]); /* make copy we can mess with */
   if (!strchr(inname, '.')) /* no dot present in filename? */
@@ -403,8 +403,8 @@ int main(int argc, char *argv[])
   Line_T     = Tree_Create(sizeof(struct Line), fcmpLine) ;
   Facet_T   = Tree_Create(sizeof(struct Facet), fcmpFacet) ;
   arXfa_T    = Tree_Create(sizeof(struct arXfa), fcmparXfa) ;
-  
- find: 
+
+ find:
   while (!feof(infile)){ /* run file up to the "ENTITIES" section */
     if (getline()) goto stopit;
     if (groupcode == 0){ /* file section mark */
@@ -461,12 +461,12 @@ int main(int argc, char *argv[])
     }
   }
 
- stopit: 
+ stopit:
   fclose(infile);
 
   nb_p  = Tree_Nbr(Point_T) ;
   new_num_pt   = (int*) Malloc ( (nb_p+1) * sizeof(int) ) ;
-  baryx /= nb_p ; baryy /= nb_p ; baryz /= nb_p ; 
+  baryx /= nb_p ; baryy /= nb_p ; baryz /= nb_p ;
   nb_l  = Tree_Nbr(Line_T) ;
   new_num_l = (int*) Malloc ( (nb_l+1) * sizeof(int) ) ;
   nb_tt = Tree_Nbr(Facet_T) ;
@@ -504,4 +504,3 @@ int main(int argc, char *argv[])
   Free(new_num_l) ;
   exit(0);
 }
-
diff --git a/utils/converters/autocad/dxf2pos.c b/utils/converters/autocad/dxf2pos.c
index 5af66d2f01..c75c86ab77 100644
--- a/utils/converters/autocad/dxf2pos.c
+++ b/utils/converters/autocad/dxf2pos.c
@@ -1,13 +1,13 @@
 /* $Id: dxf2pos.c,v 1.2 2007-09-04 13:47:07 remacle Exp $ */
 
-/* 
+/*
    AutoCAD DXF to GMSH .pos Data File Converter
 
    David.Colignon@AdValvas.be
-   
+
    This is a hack from the Autocad DXF to DKB .Data file translator Version 1.0
    written by Aaron A. Collins (8/13/90) ( http://www.sdsc.edu/~mjb/mae152/dxf.spec.txt )
-   and from dxf2geo by Christophe Geuzaine ( http://www.geuz.org/gmsh )
+   and from dxf2geo by Christophe Geuzaine ( http://www.gmsh.info )
 
 */
 
@@ -72,7 +72,7 @@ void RenumPoint(void *a, void *b)
 }
 
 struct Line {
-  int num, a, b ; 
+  int num, a, b ;
 } ;
 
 int fcmpLine (const void *a, const void *b)
@@ -114,7 +114,7 @@ void RenumLine(void *a, void *b)
 }
 
 struct arXfa {
-  int num_ar, num_el[3] ; 
+  int num_ar, num_el[3] ;
 } ;
 
 int fcmparXfa (const void *a, const void *b)
@@ -177,7 +177,7 @@ void WriteFacet_tri(void *a, void *b)
     fprintf(outfile, "%f %f %f \n", tt->z[0], tt->z[1], tt->z[2]);
     fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
     fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
-    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));    
+    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
   }
 }
 
@@ -194,12 +194,12 @@ void WriteFacet_qua(void *a, void *b)
     fprintf(outfile, "%f %f %f %f\n", tt->z[0], tt->z[1], tt->z[2], tt->z[3]);
     fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
     fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
-    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));    
-    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));    
+    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
+    fprintf(outfile, "%f %f %f \n", s*(tt->no[0]), s*(tt->no[1]), s*(tt->no[2]));
   }
 }
 
-void orienttri_3 ( int Edgs , int Tgl , int Tgll ) 
+void orienttri_3 ( int Edgs , int Tgl , int Tgll )
 {
   struct Facet tri_0 , *tri_a , *tri_b ;
   int ii , mm  , numa , numb ;
@@ -232,24 +232,24 @@ void orienttri_2 (int N1 )
       Tgl=List_Fa_1[I-1];
       tri_0.num = Tgl ;
       tri_a = (struct Facet*)Tree_PQuery(Facet_T, &tri_0) ;
-      nbar = tri_a->nbar ; 
-      for (IEdgs=1 ; IEdgs <=nbar ; IEdgs++) { 
-	  Edgs = tri_a->ar[IEdgs-1] ; 
+      nbar = tri_a->nbar ;
+      for (IEdgs=1 ; IEdgs <=nbar ; IEdgs++) {
+	  Edgs = tri_a->ar[IEdgs-1] ;
 	  arXfa_0.num_ar = Edgs ;
 	  arXfa_b = (struct arXfa*)Tree_PQuery(arXfa_T, &arXfa_0) ;
-	  for (Mult=1 ; Mult<=3 ; Mult++) { 
+	  for (Mult=1 ; Mult<=3 ; Mult++) {
 	      Tgll = arXfa_b->num_el[Mult-1] ;
 	      if ( (Tgll!=0) && (Test_ori[Tgll-1] == 0) ) {
 		  N2 = N2+1 ;
 		  List_Fa_2[N2-1] = Tgll ;
-		  orienttri_3( Edgs , Tgl , Tgll ) ; 
+		  orienttri_3( Edgs , Tgl , Tgll ) ;
 		  Test_ori[Tgll-1] = 1 ;
 	      }
 	  }
       }
   }
   for ( I=1 ; I<=N2 ; I++ ) {
-      List_Fa_1[I-1] = List_Fa_2[I-1] ; 
+      List_Fa_1[I-1] = List_Fa_2[I-1] ;
   }
   N1 = N2 ;
   if (N1!=0) goto flag1 ;
@@ -265,13 +265,13 @@ void orienttri_1 (void )
   }
   N1 = 1 ;
   List_Fa_1[1-1] = 1 ;
-  Test_ori[1-1] = 1 ; 
+  Test_ori[1-1] = 1 ;
   orienttri_2(N1) ;
   for ( ii=2 ; ii<=nb_tt ; ii++ ) {
     if ( Test_ori[ii-1] == 0 ) {
-      N1 = 1 ; 
+      N1 = 1 ;
       List_Fa_1[1-1] = ii ;
-      Test_ori[ii-1] = 1 ; 
+      Test_ori[ii-1] = 1 ;
       orienttri_2(N1) ;
     }
   }
@@ -279,13 +279,13 @@ void orienttri_1 (void )
 }
 
 void Addobj(void)
-{ 
-  struct Point      p ; 
+{
+  struct Point      p ;
   struct Line       l ;
   struct Facet   t ;
   struct arXfa      arXfa_cur ;
   int   ii , nump[4] , numl[4] , sel[4] ;
-  float det[4] ; 
+  float det[4] ;
 
   if (strstr(curobj, "POINT")){
     p.x = xc[0] ; p.y = yc[0] ; p.z = zc[0] ; AddPoint(&p) ;
@@ -300,12 +300,12 @@ void Addobj(void)
     p.x = xc[1] ; p.y = yc[1] ; p.z = zc[1] ; nump[1] = AddPoint(&p) ;
     l.a = nump[0] ; l.b = nump[1] ; AddLine(&l) ;
 
-  } else if (strstr(curobj, "3DFACE")){ 
+  } else if (strstr(curobj, "3DFACE")){
 
-    det[0] =    (((yc[1]-yc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(yc[2]-yc[0]))) ; 
-    det[1] = -1*(((xc[1]-xc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(xc[2]-xc[0]))) ; 
-    det[2] =    (((xc[1]-xc[0])*(yc[2]-yc[0]))-((yc[1]-yc[0])*(xc[2]-xc[0]))) ; 
-    det[3] = sqrt ( det[0]*det[0]+det[1]*det[1]+det[2]*det[2] ) ; 
+    det[0] =    (((yc[1]-yc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(yc[2]-yc[0]))) ;
+    det[1] = -1*(((xc[1]-xc[0])*(zc[2]-zc[0]))-((zc[1]-zc[0])*(xc[2]-xc[0]))) ;
+    det[2] =    (((xc[1]-xc[0])*(yc[2]-yc[0]))-((yc[1]-yc[0])*(xc[2]-xc[0]))) ;
+    det[3] = sqrt ( det[0]*det[0]+det[1]*det[1]+det[2]*det[2] ) ;
 
    if (xc[3] == xc[2] && yc[3] == yc[2] && zc[3] == zc[2]) {
       if ( det[3] == 0. ) {
@@ -316,12 +316,12 @@ void Addobj(void)
 
       if (xc[3] == xc[0] && yc[3] == yc[0] && zc[3] == zc[0]) {
 	printf("!!! WARNING : Degenerate quadrangular 3DFACE converted in triangle !!!\n") ;
-	xc[3] = xc[2] ; yc[3] = yc[2] ; zc[3] = zc[2] ; 
+	xc[3] = xc[2] ; yc[3] = yc[2] ; zc[3] = zc[2] ;
       }
     }
     for ( ii=0 ; ii<=2 ; ii++ ) {
       p.x = xc[ii] ; p.y = yc[ii] ; p.z = zc[ii] ; nump[ii] = AddPoint(&p) ;
-      t.no[ii] = det[ii]/det[3] ; 
+      t.no[ii] = det[ii]/det[3] ;
     }
     l.a = nump[0] ; l.b = nump[1] ; numl[0] = AddLine(&l) ; sel[0] = sl ;
     arXfa_cur.num_ar = numl[0] ; AddarXfa(&arXfa_cur) ;
@@ -344,17 +344,17 @@ void Addobj(void)
       arXfa_cur.num_ar = numl[3] ; AddarXfa(&arXfa_cur) ;
     }
     for ( ii=0 ; ii<=3 ; ii++ ) {
-      t.ar[ii] = numl[ii] ; 
+      t.ar[ii] = numl[ii] ;
       t.s[ii] = sel[ii] ;
-      t.x[ii] = xc[ii] ; t.y[ii] = yc[ii] ; t.z[ii] = zc[ii] ; 
+      t.x[ii] = xc[ii] ; t.y[ii] = yc[ii] ; t.z[ii] = zc[ii] ;
     }
-    t.ori = 1 ; 
+    t.ori = 1 ;
     AddFacet(&t) ;
   }
 }
 
 int getline(void)
-{ 
+{
   fgets(linbuf, BUFSIZE, infile); /* get a line from .DXF */
   if (feof(infile))
     return(1);
@@ -375,8 +375,8 @@ int main(int argc, char *argv[])
     }
     THETOL = atof(argv[2]) ;
   */
-  printf("\nAutoCAD DXF to Emc2000Flash .Geom Data File Converter\n") ; 
-  printf("by David Colignon ( David.Colignon@AdValvas.be )\n\n") ; 
+  printf("\nAutoCAD DXF to Emc2000Flash .Geom Data File Converter\n") ;
+  printf("by David Colignon ( David.Colignon@AdValvas.be )\n\n") ;
 
   strcpy(inname, argv[1]); /* make copy we can mess with */
   if (!strchr(inname, '.')) /* no dot present in filename? */
@@ -401,8 +401,8 @@ int main(int argc, char *argv[])
   Line_T     = Tree_Create(sizeof(struct Line), fcmpLine) ;
   Facet_T   = Tree_Create(sizeof(struct Facet), fcmpFacet) ;
   arXfa_T    = Tree_Create(sizeof(struct arXfa), fcmparXfa) ;
-  
- find: 
+
+ find:
   while (!feof(infile)){ /* run file up to the "ENTITIES" section */
     if (getline()) goto stopit;
     if (groupcode == 0){ /* file section mark */
@@ -459,12 +459,12 @@ int main(int argc, char *argv[])
     }
   }
 
- stopit: 
+ stopit:
   fclose(infile);
 
   nb_p  = Tree_Nbr(Point_T) ;
   new_num_pt   = (int*) Malloc ( (nb_p+1) * sizeof(int) ) ;
-  baryx /= nb_p ; baryy /= nb_p ; baryz /= nb_p ; 
+  baryx /= nb_p ; baryy /= nb_p ; baryz /= nb_p ;
   nb_l  = Tree_Nbr(Line_T) ;
   new_num_l = (int*) Malloc ( (nb_l+1) * sizeof(int) ) ;
   nb_tt = Tree_Nbr(Facet_T) ;
diff --git a/utils/misc/find_missing_copyright.sh b/utils/misc/find_missing_copyright.sh
index 023e9a5788..b1c2f120dd 100755
--- a/utils/misc/find_missing_copyright.sh
+++ b/utils/misc/find_missing_copyright.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-find . -type f ! -exec grep -q 'Copyright' {} \; -print
+find ../.. -not -path "*.svn*" -and -type f ! -exec grep -q 'Copyright' {} \; -print
diff --git a/utils/nightly/gmsh.ctest b/utils/nightly/gmsh.ctest
index 2e0ff81c90..07d09cf533 100644
--- a/utils/nightly/gmsh.ctest
+++ b/utils/nightly/gmsh.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 # this is the common ctest script used by all gmsh nightly (and experimental)
 # builds, on all architectures
@@ -23,7 +23,7 @@ else(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
 endif(WITH_COVERAGE AND CTEST_COVERAGE_COMMAND)
 
 set(CTEST_SOURCE_DIRECTORY "$ENV{HOME}/src/gmsh")
-set(CTEST_SVN_REPOS https://geuz.org/svn/gmsh/trunk)
+set(CTEST_SVN_REPOS https://onelab.info/svn/gmsh/trunk)
 
 if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
   set(CTEST_CHECKOUT_COMMAND 
diff --git a/utils/nightly/gmsh_linux32.ctest b/utils/nightly/gmsh_linux32.ctest
index 7268afdc7f..3c76230b29 100644
--- a/utils/nightly/gmsh_linux32.ctest
+++ b/utils/nightly/gmsh_linux32.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Linux")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Linux")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_linux32_nightly.ctest b/utils/nightly/gmsh_linux32_nightly.ctest
index 69271d3a12..920e76d113 100644
--- a/utils/nightly/gmsh_linux32_nightly.ctest
+++ b/utils/nightly/gmsh_linux32_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_linux32_test.ctest b/utils/nightly/gmsh_linux32_test.ctest
index 317d4937bf..b584883134 100644
--- a/utils/nightly/gmsh_linux32_test.ctest
+++ b/utils/nightly/gmsh_linux32_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_linux32.ctest)
diff --git a/utils/nightly/gmsh_linux64.ctest b/utils/nightly/gmsh_linux64.ctest
index 7bec7203f9..c5d0f37977 100644
--- a/utils/nightly/gmsh_linux64.ctest
+++ b/utils/nightly/gmsh_linux64.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Linux")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Linux")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_linux64_coverage.ctest b/utils/nightly/gmsh_linux64_coverage.ctest
index 2b3a9ab52d..ce4e81eb66 100644
--- a/utils/nightly/gmsh_linux64_coverage.ctest
+++ b/utils/nightly/gmsh_linux64_coverage.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "/usr/bin/cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
diff --git a/utils/nightly/gmsh_linux64_nightly.ctest b/utils/nightly/gmsh_linux64_nightly.ctest
index 3c0f38874a..e634d34444 100644
--- a/utils/nightly/gmsh_linux64_nightly.ctest
+++ b/utils/nightly/gmsh_linux64_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_linux64_test.ctest b/utils/nightly/gmsh_linux64_test.ctest
index aa33555834..64817990fd 100644
--- a/utils/nightly/gmsh_linux64_test.ctest
+++ b/utils/nightly/gmsh_linux64_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_linux64.ctest)
diff --git a/utils/nightly/gmsh_mac.ctest b/utils/nightly/gmsh_mac.ctest
index e07bc610b9..f514215c2d 100644
--- a/utils/nightly/gmsh_mac.ctest
+++ b/utils/nightly/gmsh_mac.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "/usr/local/bin/cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/MacOSX")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/MacOSX")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_mac_nightly.ctest b/utils/nightly/gmsh_mac_nightly.ctest
index a37714690a..c1ccbc893e 100644
--- a/utils/nightly/gmsh_mac_nightly.ctest
+++ b/utils/nightly/gmsh_mac_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_mac_test.ctest b/utils/nightly/gmsh_mac_test.ctest
index 7e569c1694..803975ca49 100644
--- a/utils/nightly/gmsh_mac_test.ctest
+++ b/utils/nightly/gmsh_mac_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_mac.ctest)
diff --git a/utils/nightly/gmsh_msvc.ctest b/utils/nightly/gmsh_msvc.ctest
index 90794304aa..c268c3b469 100644
--- a/utils/nightly/gmsh_msvc.ctest
+++ b/utils/nightly/gmsh_msvc.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "C:/Program Files (x86)/CMake 2.8/bin/cmake.exe")
 set(CTEST_CMAKE_GENERATOR "Visual Studio 11")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Windows")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Windows")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_msvc_nightly.ctest b/utils/nightly/gmsh_msvc_nightly.ctest
index 3df991fbc9..845d2cc4e0 100644
--- a/utils/nightly/gmsh_msvc_nightly.ctest
+++ b/utils/nightly/gmsh_msvc_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_win32.ctest b/utils/nightly/gmsh_win32.ctest
index 959d1cccfc..e00b383b51 100644
--- a/utils/nightly/gmsh_win32.ctest
+++ b/utils/nightly/gmsh_win32.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Windows")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Windows")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_win32_nightly.ctest b/utils/nightly/gmsh_win32_nightly.ctest
index 7080226474..742636cbbd 100644
--- a/utils/nightly/gmsh_win32_nightly.ctest
+++ b/utils/nightly/gmsh_win32_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_win32_test.ctest b/utils/nightly/gmsh_win32_test.ctest
index 1236a5c80b..aee0f7b9e2 100644
--- a/utils/nightly/gmsh_win32_test.ctest
+++ b/utils/nightly/gmsh_win32_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_win32.ctest)
diff --git a/utils/nightly/gmsh_win64.ctest b/utils/nightly/gmsh_win64.ctest
index 5a784e4de5..155e92ecbd 100644
--- a/utils/nightly/gmsh_win64.ctest
+++ b/utils/nightly/gmsh_win64.ctest
@@ -1,12 +1,12 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_CMAKE_COMMAND "cmake")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-set(WEB_BIN "geuzaine@geuz.org:/home/www/gmsh.info/bin/Windows")
+set(WEB_BIN "geuzaine@onelab.info:/home/www/gmsh.info/bin/Windows")
 
 set(WITH_TEST TRUE)      # run the tests?
 set(WITH_COVERAGE FALSE) # check code coverage?
diff --git a/utils/nightly/gmsh_win64_nightly.ctest b/utils/nightly/gmsh_win64_nightly.ctest
index ec887bbf19..5813f7385f 100644
--- a/utils/nightly/gmsh_win64_nightly.ctest
+++ b/utils/nightly/gmsh_win64_nightly.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
 set(CDASH_MODEL "Nightly")
diff --git a/utils/nightly/gmsh_win64_test.ctest b/utils/nightly/gmsh_win64_test.ctest
index 09a9848289..0530f60dd1 100644
--- a/utils/nightly/gmsh_win64_test.ctest
+++ b/utils/nightly/gmsh_win64_test.ctest
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(EXTRA_VERSION "-svn")
 include(gmsh_win64.ctest)
diff --git a/utils/solvers/c++/GmshSocket.h b/utils/solvers/c++/GmshSocket.h
index cfac85614d..42664f8526 100644
--- a/utils/solvers/c++/GmshSocket.h
+++ b/utils/solvers/c++/GmshSocket.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _GMSH_SOCKET_H_
 #define _GMSH_SOCKET_H_
diff --git a/utils/solvers/c++/onelab.h b/utils/solvers/c++/onelab.h
index fafc38a39c..e5c92260a3 100644
--- a/utils/solvers/c++/onelab.h
+++ b/utils/solvers/c++/onelab.h
@@ -23,7 +23,7 @@
 // OF THIS SOFTWARE.
 //
 // Please report all bugs and problems to the public mailing list
-// <gmsh@geuz.org>.
+// <gmsh@onelab.info>.
 
 #ifndef _ONELAB_H_
 #define _ONELAB_H_
diff --git a/wrappers/gmshpy/CMakeLists.txt b/wrappers/gmshpy/CMakeLists.txt
index f42b5a4ea8..b9f10c2a85 100644
--- a/wrappers/gmshpy/CMakeLists.txt
+++ b/wrappers/gmshpy/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
-# bugs and problems to the public mailing list <gmsh@geuz.org>.
+# bugs and problems to the public mailing list <gmsh@onelab.info>.
 
 set(SWIG_MODULES
   gmshCommon
-- 
GitLab