Commits in git-trip/mainline:master