Commits in globalize/mainline:master