diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index bf180f918..c4a78cfd5 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,17 @@
 ## Changelog
 
+### 1.3.7
+
+*2017-06-18*
+
+- Fixed Table with async data not showing summary row, #5318
+- Fixed Pagination's jumper value not sync with current page, #5377
+- Fixed DatePicker's shortcut panel overflow issue, #5297 (by @alashow)
+- Fixed clicking Switch not responding when some text on the page is selected, #5411
+- The red wildcard indicating required field of Form is now responsive, #5403
+- Fixed initial-index of Carousel not working, #5334
+- Fixed Popover enable to be focused when nested in a Dialog, #5336
+
 ### 1.3.6
 
 *2017-06-09*
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 5d3f3592c..270c87a17 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,5 +1,16 @@
 ## 更新日志
 
+### 1.3.7
+*2017-06-18*
+
+- 修复异步加载数据的 Table 不显示合计行的问题，#5318
+- 修复 Pagination 的输入框数值与当前页不同步的问题，#5377
+- 修复 DatePicker 的 shortcut 面板过长时的溢出问题，#5297（by @alashow）
+- 修复当页面上有被选中的文本时点击 Switch 无效的问题，#5411
+- Form 中表示必填项的小红点现在可以动态更新了，#5403
+- 修复 Carousel 的 initial-index 属性无效的问题，#5334
+- 修复嵌套于 Dialog 中的 Popover 无法被 focus 的问题，#5336
+
 ### 1.3.6
 *2017-06-09*
 
diff --git a/examples/docs/en-US/i18n.md b/examples/docs/en-US/i18n.md
index 06695b096..1225b8d43 100644
--- a/examples/docs/en-US/i18n.md
+++ b/examples/docs/en-US/i18n.md
@@ -204,6 +204,7 @@ Currently Element ships with the following languages:
   <li>Latvian (lv)</li>
   <li>Afrikaans (af-ZA)</li>
   <li>Estonian (ee)</li>
+  <li>Slovenian (sl)</li>
 </ul>
 
 If your target language is not included, you are more than welcome to contribute: just add another language config [here](https://github.com/ElemeFE/element/tree/master/src/locale/lang) and create a pull request.
diff --git a/examples/docs/zh-CN/i18n.md b/examples/docs/zh-CN/i18n.md
index 13fd608bc..42dd6c064 100644
--- a/examples/docs/zh-CN/i18n.md
+++ b/examples/docs/zh-CN/i18n.md
@@ -216,6 +216,7 @@ ElementLocale.i18n(key => i18n.t(key))
   <li>拉脱维亚语（lv）</li>
   <li>南非荷兰语（af-ZA）</li>
   <li>爱沙尼亚语（ee）</li>
+  <li>斯洛文尼亚语（sl）</li>
 </ul>
 
 如果你需要使用其他的语言，欢迎贡献 PR：只需在 [这里](https://github.com/ElemeFE/element/tree/master/src/locale/lang) 添加一个语言配置文件即可。
diff --git a/packages/date-picker/src/basic/year-table.vue b/packages/date-picker/src/basic/year-table.vue
index 3eaf65804..bd21fc161 100644
--- a/packages/date-picker/src/basic/year-table.vue
+++ b/packages/date-picker/src/basic/year-table.vue
@@ -85,7 +85,7 @@
         if (target.tagName === 'A') {
           if (hasClass(target.parentNode, 'disabled')) return;
           const year = target.textContent || target.innerText;
-          this.$emit('pick', year);
+          this.$emit('pick', Number(year));
         }
       }
     }
diff --git a/test/unit/specs/dialog.spec.js b/test/unit/specs/dialog.spec.js
index d312bbcdf..93450a47a 100644
--- a/test/unit/specs/dialog.spec.js
+++ b/test/unit/specs/dialog.spec.js
@@ -28,7 +28,7 @@ describe('Dialog', () => {
       expect(dialog.$el.style.display).to.not.equal('none');
       done();
     }, 10);
-  });
+  }).timeout(3000);
 
   it('render correct content', done => {
     vm = createVue({