From a14d1c67b010e85b8943675ebefa811a4a41b777 Mon Sep 17 00:00:00 2001
From: Michael Sarahan <msarahan@gmail.com>
Date: Thu, 14 Dec 2017 20:57:29 -0600
Subject: [PATCH] changelog 3.1.4

---
 CHANGELOG.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a7aebabb2b..ee4297cc94 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,27 @@
+2017-12-14 3.1.4:
+
+Enhancements:
+-------------
+
+* detect "used" variables in build.sh, bld.bat and any output scripts, in
+  addition to what already existed in meta.yaml. Used variables end up in the
+  hash. #2576
+* don't merge build and host prefixes. We used to do this when host subdir ==
+  build subdir. Keep them separate, so that build tools in build prefix won't
+  ever interfere with software installed to host, to be packaged.  #2579
+
+Bug fixes:
+----------
+
+* exclude grouped keys from zip_keys when computing hashes.  Only direct dependencies affect the hash.  #2573
+* fix always_include_files usage omitting other ordinarily installed files  #2580
+
+Contributors:
+-------------
+
+* @msarahan
+
+
 2017-12-13 3.1.3:
 
 Enhancements: