Version 2.0.0-dev.40.0

Merge commit '581c512345da309711369ce3878bb45119a0e732' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e1fce1..1522229 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,31 +1,15 @@
-## 2.0.0-dev.XX.0
-(Add new changes here, and they will be copied to the
- change section for the next dev version)
+## 2.0.0-dev.40.0
 
-### Language
-
-#### Strong Mode
-
-### Core library changes
-
-### Dart VM
-
+## 2.0.0-dev.39.0
 ### Tool Changes
-
 #### Pub
-
-* fixed bug in dart2js transformer when using the common front-end.
-
-#### Other Tools
+  * fixed bug in dart2js transformer when using the common front-end.
 
 ## 2.0.0-dev.38.0
 
 ## 2.0.0-dev.37.0
-
 ### Tool Changes
-
 #### dart2js
-
   * The dart2js compiler now uses the common front-end by default. This is a
     step towards supporting Dart 2.0. At this time dart2js has no semantic
     changes: the Dart 2.0 strong-mode semantics are not enabled, so dart2js
@@ -60,7 +44,6 @@
 ## 2.0.0-dev.36.0
 
 ### Core library changes
-
 * `dart:core`
   * Temporarily disabled the `whereType` method until generic methods are
     enabled on all platforms
diff --git a/tools/VERSION b/tools/VERSION
index a3f39d7..bdaeec8 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -23,9 +23,9 @@
 #  * Making cherry-picks to stable channel
 #     - increase PATCH by 1
 #
-CHANNEL be
+CHANNEL dev
 MAJOR 2
 MINOR 0
 PATCH 0
-PRERELEASE 0
+PRERELEASE 40
 PRERELEASE_PATCH 0