Merging of checkins into master to 3.0.0. branch.