[MERGE] forward port branch saas-15 up to 7a45296cf1a

3 files changed, 23 insertions, 1 deletions

diff --git a/doc/cla/individual/bigbear3001.md b/doc/cla/individual/bigbear3001.md
new file mode 100644
index 00000000000..9690403db37
--- /dev/null
+++ b/doc/cla/individual/bigbear3001.md
@@ -0,0 +1,11 @@
+Austria, 18th of March 2018
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Andreas Perhab bigbear.ap@gmx.at https://github.com/bigbear3001
diff --git a/doc/cla/individual/highcooley.md b/doc/cla/individual/highcooley.md
new file mode 100644
index 00000000000..c4e5bd37dbb
--- /dev/null
+++ b/doc/cla/individual/highcooley.md
@@ -0,0 +1,11 @@
+Switzerland, 2018-03-20
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Andreas Hochuli a.hochuli@hispeed.ch https://github.com/Highcooley
diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index 99871bda78f..90e6e4ae089 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -406,7 +406,7 @@ Source installation requires manually installing dependencies:
 
         $ sudo npm install -g less
 
-  - on Windows, `install nodejs <http://nodejs.org/download/>`_, reboot (to
+  - on Windows, `install nodejs <https://nodejs.org/en/download/>`_, reboot (to
     update the :envvar:`PATH`) and install less:
 
     .. code-block:: doscon