* Merged from master.