From 6ecf06ce60a555225b39d04b3f58baa7d5075d01 Mon Sep 17 00:00:00 2001
From: Scott Feeney <scott@oceanbase.org>
Date: Thu, 28 Jan 2016 11:27:13 -0800
Subject: [PATCH] Update CHANGELOG.md and README.md

(cherry picked from commit 741124548d152d7e8fa1be6f3e6f7601141a30bc)
---
 CHANGELOG.md | 10 ++++++++++
 README.md    |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 625071ffa8..927ea3ad2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.14.7 (January 28, 2016)
+
+### React
+- Fixed bug with `<option>` tags when using `dangerouslySetInnerHTML`
+- Fixed memory leak in synthetic event system
+
+### React TestUtils Add-on
+- Fixed bug with calling `setState` in `componentWillMount` when using shallow rendering
+
+
 ## 0.14.6 (January 6, 2016)
 
 ### React
diff --git a/README.md b/README.md
index 19c788686d..19ca236fcf 100644
--- a/README.md
+++ b/README.md
@@ -37,12 +37,12 @@ The fastest way to get started is to serve JavaScript from the CDN (also availab
 
 ```html
 <!-- The core React library -->
-<script src="https://fb.me/react-0.14.6.js"></script>
+<script src="https://fb.me/react-0.14.7.js"></script>
 <!-- The ReactDOM Library -->
-<script src="https://fb.me/react-dom-0.14.6.js"></script>
+<script src="https://fb.me/react-dom-0.14.7.js"></script>
 ```
 
-We've also built a [starter kit](https://facebook.github.io/react/downloads/react-0.14.6.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.
+We've also built a [starter kit](https://facebook.github.io/react/downloads/react-0.14.7.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.
 
 If you'd like to use [bower](http://bower.io), it's as easy as: