Merged changes from Dart Editor HEAD since
b7f6b998b5f324fc6a6ea7a6723d24cf07221449 inclusive (Feb 27 2014)