use newer version of NumPy
Merge branch 'master' into time_estimates