array/alloca.h: Fix for Windows
Merge remote-tracking branch 'origin/master' into windows
SConstruct: The mkl external should define OTHER_BLAS