Merged in from master.