Merge with upstream

This list of commits still looks kinda suspect to me...