Merge master into merge_guides2.