Merging some upstream awesomeness