Merge from dart-gde master.