merge latest scipy