numpy should be imported before scipy, as long as scipy is in
oops
Merge branch 'develop' into api-clarifications