Merged from master.