Merged from dviramontes/master.