Merge commit.
Fixed conflicts.