diff --git a/addons/event/models/event.py b/addons/event/models/event.py
index 1157d941e8b..4f7a3a4b917 100644
--- a/addons/event/models/event.py
+++ b/addons/event/models/event.py
@@ -438,9 +438,14 @@ class EventRegistration(models.Model):
     @api.multi
     def message_get_suggested_recipients(self):
         recipients = super(EventRegistration, self).message_get_suggested_recipients()
+        public_users = self.env['res.users'].sudo()
+        public_groups = self.env.ref("base.group_public", raise_if_not_found=False)
+        if public_groups:
+            public_users = public_groups.sudo().with_context(active_test=False).mapped("users")
         try:
             for attendee in self:
-                if attendee.partner_id:
+                is_public = attendee.sudo().with_context(active_test=False).partner_id.user_ids in public_users if public_users else False
+                if attendee.partner_id and not is_public:
                     attendee._message_add_suggested_recipient(recipients, partner=attendee.partner_id, reason=_('Customer'))
                 elif attendee.email:
                     attendee._message_add_suggested_recipient(recipients, email=attendee.email, reason=_('Customer Email'))
diff --git a/addons/l10n_nl/data/account_tax_template.xml b/addons/l10n_nl/data/account_tax_template.xml
index c26dc9a8345..e9b937b98f5 100644
--- a/addons/l10n_nl/data/account_tax_template.xml
+++ b/addons/l10n_nl/data/account_tax_template.xml
@@ -593,7 +593,7 @@
             <field name="refund_account_id" ref="vat_refund_h_non_eu"/>
             <field name="account_id" ref="vat_refund_h_non_eu"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_34')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
         </record>
         <record id="btw_E2" model="account.tax.template">
@@ -735,7 +735,7 @@
             <field name="refund_account_id" ref="vat_refund_h_d_non_eu"/>
             <field name="account_id" ref="vat_refund_h_d_non_eu"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_34')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
             <field name="tax_group_id" ref="tax_group_21_niet_eu"/>
         </record>
         <record id="btw_E2_d" model="account.tax.template">
diff --git a/addons/payment_ogone/controllers/main.py b/addons/payment_ogone/controllers/main.py
index 1d03a688630..409e09b8a9e 100644
--- a/addons/payment_ogone/controllers/main.py
+++ b/addons/payment_ogone/controllers/main.py
@@ -110,7 +110,7 @@ class OgoneController(http.Controller):
     def feedback(self, **kwargs):
         try:
             tx = request.env['payment.transaction'].sudo()._ogone_form_get_tx_from_data(kwargs)
-            tx._ogone_s2s_validate()
+            tx._ogone_s2s_validate_tree(kwargs)
         except ValidationError:
             return 'ko'
         return 'ok'
diff --git a/addons/stock/tests/__init__.py b/addons/stock/tests/__init__.py
index a9a18e270e4..39efa507b3b 100644
--- a/addons/stock/tests/__init__.py
+++ b/addons/stock/tests/__init__.py
@@ -4,6 +4,7 @@ from . import test_stock_flow
 from . import test_product
 from . import test_warehouse
 from . import test_shipment
+from . import test_stock_scrap
 from . import test_stock_location_search
 from . import test_quant
 from . import test_inventory
diff --git a/addons/stock/tests/test_stock_scrap.py b/addons/stock/tests/test_stock_scrap.py
new file mode 100644
index 00000000000..91bcf966ec5
--- /dev/null
+++ b/addons/stock/tests/test_stock_scrap.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+
+from odoo.tests.common import TransactionCase
+from odoo.exceptions import UserError
+
+
+class TestStockScrap(TransactionCase):
+
+    def setUp(self):
+        super(TestStockScrap, self).setUp()
+        self.user_demo = self.env.ref('base.user_demo')
+        self.scrap_obj = self.env['stock.scrap']
+        self.picking_obj = self.env['stock.picking']
+        self.stock_loc = self.browse_ref('stock.stock_location_stock')
+        self.customer_loc = self.browse_ref('stock.stock_location_customers')
+
+        # Stockable product
+        self.product_stockable = self.env['product.product'].create({
+            'type': 'product',
+            'name': 'Stockable Product',
+            'uom_id': self.env.ref('product.product_uom_unit').id,
+            'uom_po_id': self.env.ref('product.product_uom_unit').id,
+        })
+
+        # Consumable product
+        self.product_consumable = self.env['product.product'].create({
+            'type': 'consu',
+            'name': 'Consumable Product',
+            'uom_id': self.env.ref('product.product_uom_unit').id,
+            'uom_po_id': self.env.ref('product.product_uom_unit').id,
+        })
+
+        self._update_product_qty(self.product_stockable)
+
+    def _update_product_qty(self, product):
+        product_qty = self.env['stock.change.product.qty'].create({
+            'location_id': self.stock_loc.id,
+            'product_id': product.id,
+            'new_quantity': 100.0,
+        })
+        product_qty.change_product_qty()
+        return product_qty
+
+    def _prepare_picking(self, product):
+        picking = self.picking_obj.create({
+            'name': 'picking - test',
+            'location_id': self.stock_loc.id,
+            'location_dest_id': self.customer_loc.id,
+            'picking_type_id': self.ref('stock.picking_type_out'),
+            'move_lines': [(0, 0, {
+                'name': product.name,
+                'product_id': product.id,
+                'product_uom_qty': 20.0,
+                'product_uom': product.uom_id.id,
+            })]
+        })
+        return picking
+
+    def test_stock_scrap_01(self):
+        """ Standalone scrap a stockable product """
+        with self.assertRaises(UserError):
+            self.scrap_obj.create({
+                'name': 'scrap - grand test',
+                'product_id': self.product_stockable.id,
+                'product_uom_id': self.ref('product.product_uom_unit'),
+                'scrap_qty': 120,
+            })
+        self.assertEquals(self.product_stockable.qty_available, 100.0)
+
+    def test_stock_scrap_02(self):
+        """ Scrap a stockable product from a picking """
+        picking = self._prepare_picking(self.product_stockable)
+        scrap = self.scrap_obj.create({
+            'name': 'scrap - grand test',
+            'product_id': self.product_stockable.id,
+            'product_uom_id': self.ref('product.product_uom_unit'),
+            'picking_id': picking.id,
+            'scrap_qty': 80,
+        })
+        self.assertEquals(scrap.state, 'done')
+        self.assertEquals(self.product_stockable.qty_available, 20.0)
+
+    def test_stock_scrap_03(self):
+        """ Standalone scrap a consumable product """
+        scrap = self.scrap_obj.create({
+            'name': 'scrap - grand test',
+            'product_id': self.product_consumable.id,
+            'product_uom_id': self.ref('product.product_uom_unit'),
+            'scrap_qty': 100,
+        })
+        self.assertEquals(scrap.state, 'done')
+        self.assertEquals(self.product_consumable.qty_available, -100.0)
+        with self.assertRaises(UserError):
+            scrap.sudo(self.user_demo).unlink()
+
+    def test_stock_scrap_04(self):
+        """ Scrap a consumable product from a picking """
+        picking = self._prepare_picking(self.product_consumable)
+        scrap = self.scrap_obj.create({
+            'name': 'scrap - grand test',
+            'product_id': self.product_consumable.id,
+            'product_uom_id': self.ref('product.product_uom_unit'),
+            'picking_id': picking.id,
+            'scrap_qty': 100,
+        })
+        self.assertEquals(scrap.state, 'done')
+        self.assertEquals(self.product_consumable.qty_available, -100.0)
diff --git a/addons/web/static/lib/qweb/qweb-test-widgets.xml b/addons/web/static/lib/qweb/qweb-test-widgets.xml
new file mode 100644
index 00000000000..503880bcc34
--- /dev/null
+++ b/addons/web/static/lib/qweb/qweb-test-widgets.xml
@@ -0,0 +1,26 @@
+<templates>
+    <t t-name="date-simple"><t t-esc='value' /></t>
+    <params id="date-simple">{"value": "1988-09-16"}</params>
+    <result id="date-simple">1988-09-16</result>
+
+    <t t-name="datetime-simple"><t t-esc='value' /></t>
+    <params id="datetime-simple">{"value": "1988-09-16 14:00:00"}</params>
+    <result id="datetime-simple">1988-09-16 14:00:00</result>
+
+    <t t-name="datetime-widget-datetime"><t t-esc='value' t-options="{'widget': 'datetime'}" /></t>
+    <params id="datetime-widget-datetime">{"value": "1988-09-16 14:00:00"}</params>
+    <result id="datetime-widget-datetime">09/16/1988 16:00:00</result>
+
+    <t t-name="datetime-widget-date"><t t-esc='value' t-options="{'widget': 'date'}" /></t>
+    <params id="datetime-widget-date">{"value": "1988-09-16 14:00:00"}</params>
+    <result id="datetime-widget-date">09/16/1988</result>
+
+    <t t-name="datetime-widget-date-tz2"><t t-esc='value' t-options="{'widget': 'date'}" /></t>
+    <params id="datetime-widget-date-tz2">{"value": "1988-09-16 01:00:00"}</params>
+    <result id="datetime-widget-date-tz2">09/16/1988</result>
+
+    <t t-name="datetime-widget-date-tz"><t t-esc='value' t-options="{'widget': 'date'}" /></t>
+    <params id="datetime-widget-date-tz">{"value": "1988-09-16 23:00:00"}</params>
+    <result id="datetime-widget-date-tz">09/17/1988</result>
+
+</templates>
diff --git a/doc/cla/corporate/eficent.md b/doc/cla/corporate/eficent.md
index 284e2b7b691..70184f115c8 100644
--- a/doc/cla/corporate/eficent.md
+++ b/doc/cla/corporate/eficent.md
@@ -14,7 +14,6 @@ List of contributors:
 
 Aarón Henríquez ahenriquez@eficent.com https://github.com/aheficent
 Lois Rilo lois.rilo@eficent.com https://github.com/lreficent
-Roser Garcia roser.garcia@eficent.com https://github.com/rgarnau
 Miquel Raich miquel.raich@eficent.com https://github.com/mreficent
 Jordi Ballester jordi.ballester@eficent.com https://github.com/jbeficent
 Hector Villarreal hector.villarreal@eficent.com https://github.com/hveficent
diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst
index 5252ed5b776..f9158631282 100644
--- a/doc/howtos/themes.rst
+++ b/doc/howtos/themes.rst
@@ -686,7 +686,7 @@ The previous code will create the snippet’s content, but we still need to plac
 .. code-block:: xml
 
    <template id="place_into_bar" inherit_id="website.snippets" name="Place into bar">
-     <xpath expr="//div[@id='snippet_content']/div[@class='o_panel_body']" position="inside">
+     <xpath expr="//div[@id='snippet_structure']/div[@class='o_panel_body']" position="inside">
        <t t-snippet="theme_tutorial.snippet_testimonial"
           t-thumbnail="/theme_tutorial/static/src/img/ui/snippet_thumb.jpg"/>
      </xpath>
diff --git a/odoo/addons/base/ir/ir_model.py b/odoo/addons/base/ir/ir_model.py
index 139f5103ab5..c8b0a17d9c6 100644
--- a/odoo/addons/base/ir/ir_model.py
+++ b/odoo/addons/base/ir/ir_model.py
@@ -28,7 +28,7 @@ SAFE_EVAL_BASE = {
 def make_compute(text, deps):
     """ Return a compute function from its code body and dependencies. """
     func = lambda self: safe_eval(text, SAFE_EVAL_BASE, {'self': self}, mode="exec")
-    deps = [arg.strip() for arg in (deps or "").split(",")]
+    deps = [arg.strip() for arg in deps.split(",")] if deps else []
     return api.depends(*deps)(func)
 
 
diff --git a/odoo/addons/test_new_api/tests/test_new_fields.py b/odoo/addons/test_new_api/tests/test_new_fields.py
index 1e318c2e179..8e54b6bb61a 100644
--- a/odoo/addons/test_new_api/tests/test_new_fields.py
+++ b/odoo/addons/test_new_api/tests/test_new_fields.py
@@ -61,6 +61,19 @@ class TestFields(common.TransactionCase):
         self.assertTrue(field.store)
         self.assertTrue(field.readonly)
 
+    def test_10_computed_custom(self):
+        """ check definition of custom computed fields """
+        self.env['ir.model.fields'].create({
+            'name': 'x_bool_false_computed',
+            'model_id': self.env.ref('test_new_api.model_test_new_api_message').id,
+            'field_description': 'A boolean computed to false',
+            'compute': "for r in self: r['x_bool_false_computed'] = False",
+            'store': False,
+            'ttype': 'boolean'
+        })
+        field = self.env['test_new_api.message']._fields['x_bool_false_computed']
+        self.assertFalse(field.depends)
+
     def test_10_non_stored(self):
         """ test non-stored fields """
         # a field declared with store=False should not have a column
diff --git a/odoo/http.py b/odoo/http.py
index a4acca793bc..5b738486a28 100644
--- a/odoo/http.py
+++ b/odoo/http.py
@@ -1039,7 +1039,7 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         self.db = db
         self.uid = uid
         self.login = login
-        self.session_token = uid and security.compute_session_token(self)
+        self.session_token = uid and security.compute_session_token(self, request.env)
         request.uid = uid
         request.disable_db = False
 
@@ -1054,15 +1054,17 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         """
         if not self.db or not self.uid:
             raise SessionExpiredException("Session expired")
-
+        # We create our own environment instead of the request's one.
+        # to avoid creating it without the uid since request.uid isn't set yet
+        env = odoo.api.Environment(request.cr, self.uid, self.context)
         #  == BACKWARD COMPATIBILITY TO CONVERT OLD SESSION TYPE TO THE NEW ONES ! REMOVE ME AFTER 11.0 ==
         if self.get('password'):
             security.check(self.db, self.uid, self.password)
-            self.session_token = security.compute_session_token(self)
+            self.session_token = security.compute_session_token(self, env)
             self.pop('password')
         # =================================================================================================
         # here we check if the session is still valid
-        if not security.check_session(self):
+        if not security.check_session(self, env):
             raise SessionExpiredException("Session expired")
 
     def logout(self, keep_db=False):
diff --git a/odoo/service/security.py b/odoo/service/security.py
index 229e4b84077..54d108fb4b1 100644
--- a/odoo/service/security.py
+++ b/odoo/service/security.py
@@ -12,15 +12,13 @@ def check(db, uid, passwd):
     res_users = odoo.registry(db)['res.users']
     return res_users.check(db, uid, passwd)
 
-def compute_session_token(session):
-    with odoo.registry(session.db).cursor() as cr:
-        self = odoo.api.Environment(cr, session.uid, {})['res.users'].browse(session.uid)
-        return self._compute_session_token(session.sid)
+def compute_session_token(session, env):
+    self = env['res.users'].browse(session.uid)
+    return self._compute_session_token(session.sid)
 
-def check_session(session):
-    with odoo.registry(session.db).cursor() as cr:
-        self = odoo.api.Environment(cr, session.uid, {})['res.users'].browse(session.uid)
-        if odoo.tools.misc.consteq(self._compute_session_token(session.sid), session.session_token):
-            return True
-        self._invalidate_session_cache()
-        return False
+def check_session(session, env):
+    self = env['res.users'].browse(session.uid)
+    if odoo.tools.misc.consteq(self._compute_session_token(session.sid), session.session_token):
+        return True
+    self._invalidate_session_cache()
+    return False
diff --git a/odoo/tests/common.py b/odoo/tests/common.py
index 2089d298cce..332d60f76f6 100644
--- a/odoo/tests/common.py
+++ b/odoo/tests/common.py
@@ -297,7 +297,7 @@ class HttpCase(TransactionCase):
         session.db = db
         session.uid = uid
         session.login = user
-        session.session_token = uid and security.compute_session_token(session)
+        session.session_token = uid and security.compute_session_token(session, env)
         session.context = env['res.users'].context_get() or {}
         session.context['uid'] = uid
         session._fix_lang(session.context)
diff --git a/odoo/tools/misc.py b/odoo/tools/misc.py
index 03e77c703a0..2f43c58e02d 100644
--- a/odoo/tools/misc.py
+++ b/odoo/tools/misc.py
@@ -1107,13 +1107,15 @@ def format_date(env, value, lang_code=False, date_format=False):
     '''
     if not value:
         return ''
-    if isinstance(value, datetime.datetime):
-        value = value.date()
-    elif isinstance(value, pycompat.string_types):
+    if isinstance(value, pycompat.string_types):
         if len(value) < DATE_LENGTH:
             return ''
-        value = value[:DATE_LENGTH]
-        value = datetime.datetime.strptime(value, DEFAULT_SERVER_DATE_FORMAT).date()
+        if len(value) > DATE_LENGTH:
+            # a datetime, convert to correct timezone
+            value = odoo.fields.Datetime.from_string(value)
+            value = odoo.fields.Datetime.context_timestamp(env['res.lang'], value)
+        else:
+            value = odoo.fields.Datetime.from_string(value)
 
     lang = env['res.lang']._lang_get(lang_code or env.context.get('lang') or 'en_US')
     locale = babel.Locale.parse(lang.code)