Commits in w/trunk:master