Merged tests/*, matlab/*, utils/* from SVN head...