Forgot to fetch upstream first. Merged both modifications.