From 8d38dafbbff2b4f5b414e2555f47ad9352fb83b4 Mon Sep 17 00:00:00 2001
From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sun, 12 Feb 2017 00:45:37 +0800
Subject: [PATCH] ChangeLog: update after #12085

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a0e8e5680..cba47a296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+version <unreleased>
+
+Core
+* TypeError is fixed with Python 2.7.13 on Windows (#11540, #12085)
+
+
 version 2017.02.11
 
 Core