BUG: work-around maladjusted libmkl
Merge branch 'upstream'