Merge commit 'origin/platal-0.10.0'

Conflicts:

	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc core
index e33bada,f8eaef2..9ca0abd
--- 1/core
--- 2/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e33badaa2e54d255a8ef5fc9e33c797349b7ca17
 -Subproject commit f8eaef228101f1873f61c02946c11dd2211ca97b
++Subproject commit 9ca0abdd001bbf5dcda5aaa66b7b2b2073c865b9