Merge branch 'master' into xcos-layout

Change-Id: I9a9f312dd4f330667d880436cce8117f7e5e3abd

diff --cc scilab/CHANGES.md
index d22f46a,15152fd..8b5ac28
--- 1/scilab/CHANGES.md
--- 2/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@@ -177,6 -177,6 +177,8 @@@ Xco
  
  * Major rewrite of the data structures, huge models should load and save faster. The memory usage on diagram edition is also slightly reduced.
  * Implicit fixed-size step ODE solver added: Crank-Nicolson 2(3). Added to the CVode package, it also benefits from the CVode rootfinding feature.
++* Optimal Link Style: new link style for automatically finding the optimal route.
++* Split Block Auto Position: automatically reposition split blocks for better-looking layout.
  
  
  API modification

diff --cc scilab/modules/xcos/help/en_US/xcos_menu_entries.xml
Simple merge

diff --cc scilab/modules/xcos/help/fr_FR/xcos_menu_entries.xml
Simple merge

diff --cc scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
Simple merge