merged origin/7.0 into this

```git rebase origin/7.0``` gave a not clear error about
```
Applying: [FIX] fix product_code problem
Using index info to reconstruct a base tree...
M	product_customer_code_picking/stock_picking_view.xml
Falling back to patching base and 3-way merge...
Auto-merging product_customer_code_picking/stock_picking_view.xml
CONFLICT (content): Merge conflict in product_customer_code_picking/stock_picking_view.xml
Failed to merge in the changes.
Patch failed at 0013 [FIX] fix product_code problem
```