Commits in logmerge/mainline:master