Commits in strass/mainline:master