diff --git a/Makefile b/Makefile
index 6e435483f..f30d036db 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ install: check-virtualenv
 run_server:
 	${PYTHON} odoo-bin --config=${CONFIG} $(if $(MODULES),-u ${MODULES},) $(if ${DEBUG},--log-handler odoo.tools.convert:DEBUG)
 # self.env['ir.module.module'].search([('name', '=', 'crm')]).button_immediate_uninstall()
-enter_server_shell:
+enter_shell:
 	${PYTHON} odoo-bin shell --config=${CONFIG} -d ${DATABASE}
 run_test: 
 	${PYTHON} odoo-bin --test-tags :TestAccountMove.test_out_invoice_auto_post_monthly,TestAccountMove.test_included_tax --log-level=test --test-enable -d testdb-${TAG}  --stop-after-init --config=${CONFIG}
diff --git a/extra-addons b/extra-addons
index 464dfefa6..8815fc2dd 160000
--- a/extra-addons
+++ b/extra-addons
@@ -1 +1 @@
-Subproject commit 464dfefa6951922536f00eb74ae4279fc47df2a8
+Subproject commit 8815fc2dd5e6db83c51ffe4298885f245ee41fb3
diff --git a/utility b/utility
index 107eb526e..950f5cab9 160000
--- a/utility
+++ b/utility
@@ -1 +1 @@
-Subproject commit 107eb526ef0aa65b8330bdd988458c9108ba15af
+Subproject commit 950f5cab9e86dabc82cba7106f8e5d9f82848f9c