diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
index 51a4dbfc676..a30e873aeba 100644
--- a/addons/auth_signup/auth_signup_data.xml
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -22,7 +22,7 @@
         <record id="reset_password_email" model="mail.template">
             <field name="name">Reset Password</field>
             <field name="model_id" ref="base.model_res_users"/>
-            <field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
+            <field name="email_from"><![CDATA["${object.company_id.name|safe}" <${(object.company_id.email or user.email)|safe}>]]></field>
             <field name="email_to">${object.email|safe}</field>
             <field name="subject">Password reset</field>
             <field name="body_html"><![CDATA[
@@ -37,7 +37,7 @@
         <record id="set_password_email" model="mail.template">
             <field name="name">Odoo Enterprise Connection</field>
             <field name="model_id" ref="base.model_res_users"/>
-            <field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
+            <field name="email_from"><![CDATA["${object.company_id.name|safe}" <${(object.company_id.email or user.email)|safe}>]]></field>
             <field name="email_to">${object.email|safe}</field>
             <field name="subject"><![CDATA[${object.company_id.name} invitation to connect on Odoo]]></field>
             <field name="body_html">
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 07ec83cbd4e..bc85e3fba18 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -30,7 +30,7 @@ from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 from openerp.osv.orm import browse_record_list, browse_record, browse_null
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
-from openerp.tools.float_utils import float_compare
+from openerp.tools.float_utils import float_compare, float_is_zero
 from openerp.exceptions import UserError
 
 class purchase_order(osv.osv):
@@ -817,7 +817,8 @@ class purchase_order(osv.osv):
                 'propagate': procurement.rule_id.propagate,
             })
             diff_quantity -= min(procurement_qty, diff_quantity)
-            res.append(tmp)
+            if not float_is_zero(tmp['product_uom_qty'], precision_rounding=order_line.product_uom.rounding):
+                res.append(tmp)
         #if the order line has a bigger quantity than the procurement it was for (manually changed or minimal quantity), then
         #split the future stock move in two because the route followed may be different.
         if float_compare(diff_quantity, 0.0, precision_rounding=order_line.product_uom.rounding) > 0:
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 34f3e3a4988..c6b5c6b5882 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3481,12 +3481,12 @@ instance.web.form.CompletionFieldMixin = {
         var pop = new instance.web.form.SelectCreatePopup(this);
         pop.select_element(
             self.field.relation,
-            {
+            _.extend(this.options || {}, {
                 title: (view === 'search' ? _t("Search: ") : _t("Create: ")) + this.string,
                 initial_ids: ids ? _.map(ids, function(x) {return x[0];}) : undefined,
                 initial_view: view,
                 disable_multiple_selection: true
-            },
+            }),
             self.build_domain(),
             new instance.web.CompoundContext(self.build_context(), context || {})
         );
diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index e804525be18..ed108112f5e 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -110,7 +110,7 @@
         <record id="validation_email" model="mail.template">
             <field name="name">Email Verification</field>
             <field name="model_id" ref="base.model_res_users"/>
-            <field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
+            <field name="email_from"><![CDATA["${object.company_id.name|safe}" <${(object.company_id.email or user.email)|safe}>]]></field>
             <field name="email_to">${object.email|safe}</field>
             <field name="subject"><![CDATA[${object.company_id.name} Forums validation]]></field>
             <field name="body_html"><![CDATA[
diff --git a/doc/cla/corporate/boolit.md b/doc/cla/corporate/boolit.md
new file mode 100644
index 00000000000..855d545d408
--- /dev/null
+++ b/doc/cla/corporate/boolit.md
@@ -0,0 +1,16 @@
+Lithuania, 2017-01-26
+
+Boolit JSC agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Andrius Laukavičius dev@boolit.eu https://github.com/oerp-odoo
+
+List of contributors:
+
+Dainius Kaniava dka@boolit.eu https://github.com/boolit-dka
+Andrius Laukavičius dev@boolit.eu https://github.com/oerp-odoo