diff --git a/addons/account/account.py b/addons/account/account.py
index 8c6dd413a4e..6cd264f91f3 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1569,7 +1569,7 @@ class account_move(osv.osv):
 
                 if line.account_id.currency_id and line.currency_id:
                     if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id):
-                        raise UserError(_("""Cannot create move with currency different from ..""") % (line.account_id.code, line.account_id.name))
+                        raise UserError(_("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""") % (line.account_id.code, line.account_id.name))
 
             if round(abs(amount), prec) < 10 ** (-max(5, prec)):
                 # If the move is balanced
diff --git a/doc/cla/individual/vincentadriaensen.md b/doc/cla/individual/vincentadriaensen.md
new file mode 100644
index 00000000000..3fcaa1d1352
--- /dev/null
+++ b/doc/cla/individual/vincentadriaensen.md
@@ -0,0 +1,11 @@
+Belgium, 19/07/2017
+
+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,
+
+Vincent Adriaensen vincentadriaensen@users.noreply.github.com https://github.com/vincentadriaensen
diff --git a/openerp/service/server.py b/openerp/service/server.py
index f466379899c..8b26250fa6c 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -74,12 +74,11 @@ class BaseWSGIServerNoBind(LoggingBaseWSGIServerMixIn, werkzeug.serving.BaseWSGI
     use this class, sets the socket and calls the process_request() manually
     """
     def __init__(self, app):
-        werkzeug.serving.BaseWSGIServer.__init__(self, "1", "1", app)
-    def server_bind(self):
-        # we dont bind beause we use the listen socket of PreforkServer#socket
-        # instead we close the socket
+        werkzeug.serving.BaseWSGIServer.__init__(self, "127.0.0.1", 0, app)
+        # Directly close the socket. It will be replaced by WorkerHTTP when processing requests
         if self.socket:
             self.socket.close()
+
     def server_activate(self):
         # dont listen as we use PreforkServer#socket
         pass
@@ -565,6 +564,7 @@ class PreforkServer(CommonServer):
 
         if self.address:
             # listen to socket
+            _logger.info('HTTP service (werkzeug) running on %s:%s', *self.address)
             self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             self.socket.setblocking(0)