Merge pull request #1885 from karlnapf/develop

modelselection_grid_search_mkl
changed license to bsd 2clause