Merge branch 'numpy_mac_shared_flag'
Merge branch 'update_next' into devel-master