Merge branch 'master' into scipy_dependency