Merge pull request #47 from dart-lang/dart2

dart2 fixes