Merging master into second_merge.