Merge with upstream

This will duplicate some history, but should allow us to merge some pull requests here early without risking to compromise our internal setup.