Merge latest changes from master.