Merging unstable back into netlib

I think all the projects and import changes should be resolved with this PR.