Merge patch-1 into master, resolving conflicts.