diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d021efc1f..26824aa334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -291,6 +291,7 @@
   - 移除 `animation` 属性，并在 `tabPosition="top|bottom"` 时默认启用切换动画。
 - Timepicker
   - **重命名为 TimePicker。**
+  - 国际化属性 `locale` 结构发生了 [变化](https://github.com/ant-design/ant-design/issues/1270#issuecomment-201181384)。
   - 新增 `value` 属性。
   - 新增属性 `disabledHours` `disabledMinutes` `disabledSeconds`。[演示](http://ant.design/components/time-picker/#picker-demo-disable-options)
   - 移除 `hourOptions` `minuteOptions` `secondOptions`，新增 `hideDisabled` 属性用于替代。
diff --git a/components/form/index.md b/components/form/index.md
index 6c90d50e3a..7eb3ee00ef 100644
--- a/components/form/index.md
+++ b/components/form/index.md
@@ -81,7 +81,7 @@ CustomizedForm = Form.create({})(CustomizedForm);
 | getFieldError | 获取某个输入控件的 Error | Function(name) | | |
 | isFieldValidating | 判断一个输入控件是否在校验状态 | Function(name) | | |
 | resetFields | 重置一组输入控件的值与状态，如不传入参数，则重置所有组件 | Function([names: string[]]) | | |
-| getFieldProps 详见下面描述 | | | | |
+| getFieldProps | 用于和表单进行双向绑定，详见下方描述 | | | |
 
 #### this.props.form.getFieldProps(id, options)
 
@@ -132,8 +132,9 @@ CustomizedForm = Form.create({})(CustomizedForm);
 #### Input.Group
 
 ```html
-<Input.Group className={string}>      // 样式类名前缀，默认是 ant-input-group，通常您不需要设置。
-  {children}
+<Input.Group className={string}>
+  <Input />
+  <Input />
 </Input.Group>
 ```
 
diff --git a/components/time-picker/index.md b/components/time-picker/index.md
index 42014b1eb0..b22cc60c81 100644
--- a/components/time-picker/index.md
+++ b/components/time-picker/index.md
@@ -34,6 +34,6 @@ API
 | disabledMinutes     | 禁止选择部分分钟选项 | function(selectedHour) | 无 |
 | disabledSeconds     | 禁止选择部分秒选项 | function(selectedHour, selectedMinute) | 无 |
 | hideDisabledOptions | 隐藏禁止选择的选项 | boolean | false |
-| locale              | 国际化配置 | Object | [默认配置](https://github.com/ant-design/ant-design/issues/424) |
+| locale              | 国际化配置 | Object | [默认配置](https://github.com/ant-design/ant-design/issues/1270#issuecomment-201181384) |
 
 <style>.code-box-demo .ant-time-picker { margin: 0 8px 12px 0; }</style>
diff --git a/docs/react/upgrade-notes.md b/docs/react/upgrade-notes.md
index acc34a8034..a0b5a36921 100644
--- a/docs/react/upgrade-notes.md
+++ b/docs/react/upgrade-notes.md
@@ -4,7 +4,7 @@
 
 ---
 
-这里只列出升级中的不兼容改动，其他改动见 [Changelog](/changelog)。
+此处着重列出升级中的不兼容变化和推荐改动。所有变动请见 [Changelog](/changelog)。
 
 ## 0.11 => 0.12
 
@@ -76,6 +76,10 @@ import 'antd/style/index.less';
 
 如果无法理解受控组件，只须在发现在选中日期后 `Datepicker` 显示的值不变的情况后，把其 `value` 属性改为 `defaultValue` 即可。
 
+### TimePicker locale 结构改变
+
+属性 `locale` 结构发生了 [变化](https://github.com/ant-design/ant-design/commit/fd1312803fd49586ded9af39d923457540c515cc#diff-fe4bfc98d91fc3dab8f391e3258622d4L1)，需要将原有的属性改为现有的[结构](https://github.com/ant-design/ant-design/issues/1270#issuecomment-201181384)。
+
 ### 其他
 
 - Alert 组件默认不展示样式，可以用 `showIcon` 属性添加图标。
diff --git a/nico.js b/nico.js
index 4b1358eb46..9a8fa63a4f 100644
--- a/nico.js
+++ b/nico.js
@@ -93,6 +93,7 @@ exports.middlewares = [
     name: 'webpackDevMiddleware',
     filter: /\.(js|css|json)(\.map)?(\?.*)?$/,
     handle: function(req, res, next) {
+      req.path = req.path || req.url;
       handler = handler || webpackMiddleware(webpackCompiler, {
         publicPath: webpackConfig.output.publicPath,
         lazy: false,
diff --git a/style/components/table.less b/style/components/table.less
index 42b933a947..9a17f1a8c6 100644
--- a/style/components/table.less
+++ b/style/components/table.less
@@ -7,6 +7,8 @@
 .@{table-prefix-cls} {
   font-size: @font-size-base;
   color: @text-color;
+  border-radius: @border-radius-base @border-radius-base 0 0;
+  overflow: hidden;
 
   &-body {
     transition: opacity 0.3s ease;
@@ -17,15 +19,12 @@
     max-width: 100%;
     border-collapse: separate;
     text-align: left;
-    border-radius: @border-radius-base;
-    overflow: hidden;
   }
 
   th {
     background: @table-head-background-color;
     font-weight: bold;
     transition: background .3s ease;
-    position: relative;
     text-align: left;
 
     .anticon-filter {
@@ -352,6 +351,9 @@
   &-column-hidden {
     display: none;
   }
+  th&-column-has-prev {
+    position: relative;
+  }
   th&-column-has-prev,
   td&-column-has-prev {
     padding-left: 24px;