Version 1.17.0-dev.6.1

Cherry-pick 'fba5cbc425e54b015d9ffefac4e0789d5502846c' into dev
Cherry-pick '5a9b6003605bdf864ae9f4c9c4b709efcda9fe0b' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1476317..ca849bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,9 @@
   * A bug has been fixed in which `pub get --offline` would crash when a
     prerelease version was selected.
 
+* Dartium and content shell
+  * Debugging Dart code inside iframes improved, was broken.
+
 ## 1.16.0 - 2016-04-26
 
 ### Core library changes
diff --git a/tools/VERSION b/tools/VERSION
index 56c1ccb..7055357 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 17
 PATCH 0
 PRERELEASE 6
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1