development merge

I think I finally learned how to merge from upstream. This should resolve the conflicts.