Merging with upstream! :D