diff --git a/addons/l10n_be_invoice_bba/models/account_invoice.py b/addons/l10n_be_invoice_bba/models/account_invoice.py
index 3cf74d36d97..e76117a2afa 100644
--- a/addons/l10n_be_invoice_bba/models/account_invoice.py
+++ b/addons/l10n_be_invoice_bba/models/account_invoice.py
@@ -181,4 +181,6 @@ class AccountInvoice(models.Model):
             default['reference_type'] = reference_type
             if reference_type == 'bba':
                 default['reference'] = self.generate_bbacomm(self.type, reference_type, self.partner_id.id, '')['value']['reference']
+        elif self.reference_type == 'bba':
+            default['reference_type'] = 'none'
         return super(AccountInvoice, self).copy(default)
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 76230befea5..19fbddae8c1 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -862,7 +862,7 @@
 </t>
 <t t-name="FieldMany2One">
     <t t-if="widget.get('effective_readonly')">
-        <a t-if="!widget.options.no_open" class="o_form_uri" href="#"/>
+        <a t-if="!widget.options.no_open" t-att-tabindex="widget.node.attrs.tabindex" class="o_form_uri" href="#"/>
         <span t-if="widget.options.no_open"/>
     </t>
     <div t-if="!widget.get('effective_readonly')" t-att-class="'o_form_field_many2one' + ((widget.options.no_open)? '' : ' o_with_button')">
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 91735993449..3204f586e9f 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -408,7 +408,7 @@
                         <div class="col-sm-7">
                             <span itemprop="image" t-attf-content="{{request.httprequest.url_root}}web/image/product.template/{{product.id}}/image" t-field="product.image" t-options="{'widget': 'image', 'class': 'product_detail_img', 'alt-field': 'name', 'zoom': 'image'}" groups="!website_sale.group_website_multi_image"/>
                             <t groups="website_sale.group_website_multi_image">
-                                <t t-set="variant_img" t-value="product.product_variant_id.image_variant"/>
+                                <t t-set="variant_img" t-value="any(product.mapped('product_variant_ids.image_variant'))"/>
                                 <t t-set="image_ids"  t-value="product.product_image_ids"/>
                                 <div id="o-carousel-product" class="carousel slide" data-ride="carousel" data-interval="0">
                                   <div class="carousel-outer">
diff --git a/doc/cla/individual/rakete.md b/doc/cla/individual/rakete.md
new file mode 100644
index 00000000000..72fa2bcea7c
--- /dev/null
+++ b/doc/cla/individual/rakete.md
@@ -0,0 +1,11 @@
+Germany, 2017-11-24
+
+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 Raster lazor@affenbande.org https://github.com/rakete
diff --git a/doc/cla/individual/zoggy444.md b/doc/cla/individual/zoggy444.md
new file mode 100644
index 00000000000..46f8490f973
--- /dev/null
+++ b/doc/cla/individual/zoggy444.md
@@ -0,0 +1,11 @@
+FRANCE, 2018-09-26
+
+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,
+
+zoggy 43614933+zoggy444@users.noreply.github.com https://github.com/zoggy444
diff --git a/odoo/addons/base/base.sql b/odoo/addons/base/base.sql
index 57d57a1389b..4951456f9e8 100644
--- a/odoo/addons/base/base.sql
+++ b/odoo/addons/base/base.sql
@@ -106,6 +106,7 @@ CREATE TABLE res_company (
     name varchar NOT NULL,
     partner_id integer,
     currency_id integer,
+    sequence integer,
     primary key(id)
 );
 
diff --git a/odoo/service/server.py b/odoo/service/server.py
index 0bf0b96d38e..03566609b25 100644
--- a/odoo/service/server.py
+++ b/odoo/service/server.py
@@ -135,6 +135,8 @@ class FSWatcher(object):
                     try:
                         source = open(path, 'rb').read() + '\n'
                         compile(source, path, 'exec')
+                    except FileNotFoundError:
+                        _logger.error('autoreload: python code change detected, FileNotFound for %s', path)
                     except SyntaxError:
                         _logger.error('autoreload: python code change detected, SyntaxError in %s', path)
                     else: