diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
index efc439f435e..fb911b88627 100644
--- a/addons/delivery/models/sale_order.py
+++ b/addons/delivery/models/sale_order.py
@@ -88,7 +88,7 @@ class SaleOrder(models.Model):
         # Create the sales order line
         values = {
             'order_id': self.id,
-            'name': carrier.name,
+            'name': carrier.with_context(lang=self.partner_id.lang).name,
             'product_uom_qty': 1,
             'product_uom': carrier.product_id.uom_id.id,
             'product_id': carrier.product_id.id,
diff --git a/addons/maintenance/models/maintenance.py b/addons/maintenance/models/maintenance.py
index 3acfdd86504..8262d8a566b 100644
--- a/addons/maintenance/models/maintenance.py
+++ b/addons/maintenance/models/maintenance.py
@@ -346,8 +346,8 @@ class MaintenanceRequest(models.Model):
         if vals.get('owner_user_id'):
             self.message_subscribe_users(user_ids=[vals['owner_user_id']])
         res = super(MaintenanceRequest, self).write(vals)
-        if self.stage_id.done and 'stage_id' in vals:
-            self.write({'close_date': fields.Date.today()})
+        if 'stage_id' in vals:
+            self.filtered(lambda m: m.stage_id.done).write({'close_date': fields.Date.today()})
         return res
 
     @api.model
diff --git a/addons/mass_mailing/static/src/less/themes/theme_default.less b/addons/mass_mailing/static/src/less/themes/theme_default.less
index 3bde380c89d..cefbfec294d 100644
--- a/addons/mass_mailing/static/src/less/themes/theme_default.less
+++ b/addons/mass_mailing/static/src/less/themes/theme_default.less
@@ -95,7 +95,6 @@ td {
     }
 
     .btn.btn-primary {
-        -webkit-user-select: none;
         color: @o_mm_def_btn_text;
         border: none;
         text-decoration: none;
diff --git a/addons/stock_account/report/stock_history.py b/addons/stock_account/report/stock_history.py
index 077aea8cef5..fabf4ff7add 100644
--- a/addons/stock_account/report/stock_history.py
+++ b/addons/stock_account/report/stock_history.py
@@ -53,7 +53,7 @@ class StockHistory(models.Model):
             stock_histories_by_group = {}
             for line in self._cr.dictfetchall():
                 stock_history_data[line['id']] = line
-                key = tuple(line[g] if g in line else False for g in groupby_list)
+                key = tuple(line.get(g) or False for g in groupby_list)
                 stock_histories_by_group.setdefault(key, [])
                 stock_histories_by_group[key] += [line['id']]
 
diff --git a/addons/web_editor/static/src/js/snippets.options.js b/addons/web_editor/static/src/js/snippets.options.js
index 1444f404ff6..daceee43eaa 100644
--- a/addons/web_editor/static/src/js/snippets.options.js
+++ b/addons/web_editor/static/src/js/snippets.options.js
@@ -565,6 +565,7 @@ odoo.define('web_editor.snippets.options', function (require) {
 
             this.$el.find('.note-color-reset').on('click', function () {
                 self.$target.removeClass(self.classes);
+                self.$target.trigger('content_changed');
                 $colors.removeClass("selected");
             });
         }
diff --git a/addons/web_editor/static/src/less/web_editor.ui.less b/addons/web_editor/static/src/less/web_editor.ui.less
index db1d6a8b2fe..02094adf754 100644
--- a/addons/web_editor/static/src/less/web_editor.ui.less
+++ b/addons/web_editor/static/src/less/web_editor.ui.less
@@ -1069,6 +1069,9 @@ body.editor_enable {
             left: 0;
         }
     }
+    .btn {
+        -webkit-user-select: initial;
+    }
 }
 
 #web_editor_inside_iframe {
diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/res/res_country_data.xml
index ca7572658d5..8337bd09883 100644
--- a/odoo/addons/base/res/res_country_data.xml
+++ b/odoo/addons/base/res/res_country_data.xml
@@ -454,7 +454,7 @@
             <field name="name">Ecuador</field>
             <field name="code">ec</field>
             <field file="base/static/img/country_flags/ec.png" name="image" type="base64" />
-            <field name="currency_id" ref="ECS" />
+            <field name="currency_id" ref="USD" />
             <field eval="593" name="phone_code" />
         </record>
         <record id="ee" model="res.country">
diff --git a/odoo/tools/config.py b/odoo/tools/config.py
index 475f959a025..be62f7c8b5a 100644
--- a/odoo/tools/config.py
+++ b/odoo/tools/config.py
@@ -448,6 +448,8 @@ class configmanager(object):
                     os.path.abspath(os.path.expanduser(os.path.expandvars(x.strip())))
                       for x in self.options['addons_path'].split(','))
 
+        self.options['data_dir'] = os.path.abspath(os.path.expanduser(os.path.expandvars(self.options['data_dir'].strip())))
+
         self.options['init'] = opt.init and dict.fromkeys(opt.init.split(','), 1) or {}
         self.options['demo'] = (dict(self.options['init'])
                                 if not self.options['without_demo'] else {})