diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php
index c0b390c..02a710c 100644
--- a/build/controllers/PhpDocController.php
+++ b/build/controllers/PhpDocController.php
@@ -133,7 +133,11 @@ class PhpDocController extends Controller
                 '/extensions/composer/',
                 '/extensions/gii/components/DiffRendererHtmlInline.php',
                 '/extensions/gii/generators/extension/default/*',
+                '/extensions/twig/Extension.php',
+                '/extensions/twig/Optimizer.php',
+                '/extensions/twig/Template.php',
                 '/extensions/twig/TwigSimpleFileLoader.php',
+                '/extensions/twig/ViewRendererStaticClassProxy.php',
                 '/framework/BaseYii.php',
                 '/framework/Yii.php',
                 'assets/',
diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php
index 12034f2..d7706eb 100644
--- a/build/controllers/ReleaseController.php
+++ b/build/controllers/ReleaseController.php
@@ -135,8 +135,8 @@ class ReleaseController extends Controller
 
         $i = 0;
         ArrayHelper::multisort($changelog, function($line) use (&$i) {
-            if (preg_match('/^- (Chg|Enh|Bug)( #\d+(, #\d+)*)?: .+$/', $line, $m)) {
-                $o = ['Bug' => 'C', 'Enh' => 'D', 'Chg' => 'E'];
+            if (preg_match('/^- (Chg|Enh|Bug|New)( #\d+(, #\d+)*)?: .+$/', $line, $m)) {
+                $o = ['Bug' => 'C', 'Enh' => 'D', 'Chg' => 'E', 'New' => 'F'];
                 return $o[$m[1]] . ' ' . (!empty($m[2]) ? $m[2] : 'AAAA' . $i++);
             }
             return 'B' . $i++;
diff --git a/framework/BaseYii.php b/framework/BaseYii.php
index 7e590e0..bd1d6fa 100644
--- a/framework/BaseYii.php
+++ b/framework/BaseYii.php
@@ -93,7 +93,7 @@ class BaseYii
      */
     public static function getVersion()
     {
-        return '2.0.7-dev';
+        return '2.0.7';
     }
 
     /**
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 675d0a7..af68ccf 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -1,7 +1,7 @@
 Yii Framework 2 Change Log
 ==========================
 
-2.0.7 under development
+2.0.7 February 14, 2016
 -----------------------
 
 - Bug #6351: Find MySQL FK constraints from `information_schema` tables instead of `SHOW CREATE TABLE` to improve reliability (nineinchnick)
@@ -121,12 +121,12 @@ Yii Framework 2 Change Log
 - Enh #10797: Cleaned up requirements checker CSS (muhammadcahya)
 - Enh: Added last resort measure for `FileHelper::removeDirectory()` fail to unlink symlinks under Windows (samdark)
 - Enh: `AttributeBehavior::getValue()` now respects the callable in array format (silverfire)
+- Chg #6419: Added `yii\web\ErrorHandler::displayVars` make list of displayed vars customizable. `$_ENV` and `$_SERVER` are not displayed by default anymore (silverfire)
 - Chg #9369: `Yii::$app->user->can()` now returns `false` instead of erroring in case `authManager` component is not configured (creocoder)
 - Chg #9411: `DetailView` now automatically sets container tag ID in case it's not specified (samdark)
-- Chg #9953: `TimestampBehavior::getValue()` changed to make value processing consistent with `AttributeBehavior::getValue()` (silverfire)
-- Chg #6419: Added `yii\web\ErrorHandler::displayVars` make list of displayed vars customizable. `$_ENV` and `$_SERVER` are not displayed by default anymore (silverfire)
 - Chg #9528: Traversable objects are now formatted as arrays in `yii\web\XmlResponseFormatter` to support SPL objects and Generators (MaXL-ru)
-- Chg #9878,9879,9880: Make `\base\Security` use `random_bytes()`, LibreSSL, mcrypt, limit OpenSSL to Windows, and to prefer `password_hash()` over `crypt()` (tom--)
+- Chg #9878, #9879, #9880: Make `\base\Security` use `random_bytes()`, LibreSSL, mcrypt, limit OpenSSL to Windows, and to prefer `password_hash()` over `crypt()` (tom--)
+- Chg #9953: `TimestampBehavior::getValue()` changed to make value processing consistent with `AttributeBehavior::getValue()` (silverfire)
 - Chg #10296: Methods mset, mget and madd of `\yii\caching\Cache` have been marked as deprecated (trejder, githubjeka)
 - Chg: ApcCache is now able to handle PHP 7 APCu (samdark)
 - Chg: `BlameableBehavior::getValue()` changed to make value processing consistent with `AttributeBehavior::getValue()` (silverfire)
diff --git a/framework/base/Theme.php b/framework/base/Theme.php
index 2306621..f2ebb8f 100644
--- a/framework/base/Theme.php
+++ b/framework/base/Theme.php
@@ -64,7 +64,7 @@ use yii\helpers\FileHelper;
  * @property string $basePath The root path of this theme. All resources of this theme are located under this
  * directory.
  * @property string $baseUrl The base URL (without ending slash) for this theme. All resources of this theme
- * are considered to be under this base URL. This property is read-only.
+ * are considered to be under this base URL.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
diff --git a/framework/classes.php b/framework/classes.php
index 135a9d7..d11666e 100644
--- a/framework/classes.php
+++ b/framework/classes.php
@@ -115,6 +115,7 @@ return [
   'yii\db\Transaction' => YII2_PATH . '/db/Transaction.php',
   'yii\db\cubrid\QueryBuilder' => YII2_PATH . '/db/cubrid/QueryBuilder.php',
   'yii\db\cubrid\Schema' => YII2_PATH . '/db/cubrid/Schema.php',
+  'yii\db\mssql\ColumnSchemaBuilder' => YII2_PATH . '/db/mssql/ColumnSchemaBuilder.php',
   'yii\db\mssql\PDO' => YII2_PATH . '/db/mssql/PDO.php',
   'yii\db\mssql\QueryBuilder' => YII2_PATH . '/db/mssql/QueryBuilder.php',
   'yii\db\mssql\Schema' => YII2_PATH . '/db/mssql/Schema.php',
@@ -125,6 +126,7 @@ return [
   'yii\db\oci\ColumnSchemaBuilder' => YII2_PATH . '/db/oci/ColumnSchemaBuilder.php',
   'yii\db\oci\QueryBuilder' => YII2_PATH . '/db/oci/QueryBuilder.php',
   'yii\db\oci\Schema' => YII2_PATH . '/db/oci/Schema.php',
+  'yii\db\pgsql\ColumnSchemaBuilder' => YII2_PATH . '/db/pgsql/ColumnSchemaBuilder.php',
   'yii\db\pgsql\QueryBuilder' => YII2_PATH . '/db/pgsql/QueryBuilder.php',
   'yii\db\pgsql\Schema' => YII2_PATH . '/db/pgsql/Schema.php',
   'yii\db\sqlite\QueryBuilder' => YII2_PATH . '/db/sqlite/QueryBuilder.php',
@@ -243,6 +245,7 @@ return [
   'yii\validators\FilterValidator' => YII2_PATH . '/validators/FilterValidator.php',
   'yii\validators\ImageValidator' => YII2_PATH . '/validators/ImageValidator.php',
   'yii\validators\InlineValidator' => YII2_PATH . '/validators/InlineValidator.php',
+  'yii\validators\IpValidator' => YII2_PATH . '/validators/IpValidator.php',
   'yii\validators\NumberValidator' => YII2_PATH . '/validators/NumberValidator.php',
   'yii\validators\PunycodeAsset' => YII2_PATH . '/validators/PunycodeAsset.php',
   'yii\validators\RangeValidator' => YII2_PATH . '/validators/RangeValidator.php',
@@ -295,6 +298,7 @@ return [
   'yii\web\SessionIterator' => YII2_PATH . '/web/SessionIterator.php',
   'yii\web\TooManyRequestsHttpException' => YII2_PATH . '/web/TooManyRequestsHttpException.php',
   'yii\web\UnauthorizedHttpException' => YII2_PATH . '/web/UnauthorizedHttpException.php',
+  'yii\web\UnprocessableEntityHttpException' => YII2_PATH . '/web/UnprocessableEntityHttpException.php',
   'yii\web\UnsupportedMediaTypeHttpException' => YII2_PATH . '/web/UnsupportedMediaTypeHttpException.php',
   'yii\web\UploadedFile' => YII2_PATH . '/web/UploadedFile.php',
   'yii\web\UrlManager' => YII2_PATH . '/web/UrlManager.php',
diff --git a/framework/console/Controller.php b/framework/console/Controller.php
index 4157d8f..ccf0f3a 100644
--- a/framework/console/Controller.php
+++ b/framework/console/Controller.php
@@ -29,6 +29,10 @@ use yii\helpers\Console;
  *
  * @property string $help This property is read-only.
  * @property string $helpSummary This property is read-only.
+ * @property array $passedOptionValues The properties corresponding to the passed options. This property is
+ * read-only.
+ * @property array $passedOptions The names of the options passed during execution. This property is
+ * read-only.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
diff --git a/framework/helpers/mimeTypes.php b/framework/helpers/mimeTypes.php
index 46ede3d..5da7ee3 100644
--- a/framework/helpers/mimeTypes.php
+++ b/framework/helpers/mimeTypes.php
@@ -414,6 +414,7 @@ return [
     'm3a' => 'audio/mpeg',
     'm3u' => 'audio/x-mpegurl',
     'm3u8' => 'application/vnd.apple.mpegurl',
+    'm4a' => 'audio/mp4',
     'm4u' => 'video/vnd.mpegurl',
     'm4v' => 'video/x-m4v',
     'ma' => 'application/mathematica',
diff --git a/framework/validators/IpValidator.php b/framework/validators/IpValidator.php
index 044e042..e398768 100644
--- a/framework/validators/IpValidator.php
+++ b/framework/validators/IpValidator.php
@@ -32,6 +32,9 @@ use yii\web\JsExpression;
  * ['ip_address', 'ip', 'expandIPv6' => true], // expands IPv6 address to a full notation format
  * ```
  *
+ * @property array $ranges The IPv4 or IPv6 ranges that are allowed or forbidden. See [[setRanges()]] for
+ * detailed description.
+ *
  * @author Dmitry Naumenko <d.naumenko.a@gmail.com>
  * @since 2.0.7
  */
diff --git a/framework/web/Request.php b/framework/web/Request.php
index 356fb14..18b9a6e 100644
--- a/framework/web/Request.php
+++ b/framework/web/Request.php
@@ -64,7 +64,7 @@ use yii\helpers\StringHelper;
  * @property array $queryParams The request GET parameter values.
  * @property string $queryString Part of the request URL that is after the question mark. This property is
  * read-only.
- * @property string $rawBody The request body. This property is read-only.
+ * @property string $rawBody The request body.
  * @property string $referrer URL referrer, null if not present. This property is read-only.
  * @property string $scriptFile The entry script file path.
  * @property string $scriptUrl The relative URL of the entry script.