Merge from dartlang-italia/master