Merge remote-tracking branch 'origin/master' into MPI

Change-Id: I9049a67287d944ee7aa14b5f985ac0bc95c7a285

diff --cc scilab/Makefile.am
Simple merge

diff --cc scilab/Makefile.in
Simple merge

diff --cc scilab/configure
Simple merge

diff --cc scilab/configure.ac
Simple merge

diff --cc scilab/modules/console/src/c/others/mainscic.c
Simple merge

diff --cc scilab/modules/core/src/c/dynamic_gateways.c
Simple merge

diff --cc scilab/modules/development_tools/macros/test_run.sci
Simple merge

diff --cc scilab/modules/differential_equations/Makefile.in
Simple merge

diff --cc scilab/modules/double/Makefile.in
Simple merge

diff --cc scilab/modules/graphics/Makefile.in
Simple merge

diff --cc scilab/modules/linear_algebra/Makefile.in
Simple merge

diff --cc scilab/modules/scicos/Makefile.in
Simple merge

diff --cc scilab/modules/scicos_blocks/Makefile.in
Simple merge

diff --cc scilab/modules/ui_data/Makefile.in
Simple merge

diff --cc scilab/modules/xcos/Makefile.in
Simple merge