Merging changes from master.