scilab-5.4.1 with patches to build system
fixed a bad merge