Version 0.2.6.0

svn merge -r 15295:15346 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
and cherry pick 15354 from bleeding edge to trunk.

git-svn-id: http://dart.googlecode.com/svn/trunk@15355 260f80e4-7a28-3924-810f-c04153c831b5