Merging in changes from master.