Forgot some conflicts, merged with upstream master