From 0734f575941de47c6562b039528dade721bba8cc Mon Sep 17 00:00:00 2001
From: Fitz Elliott <fitz@cos.io>
Date: Wed, 12 Dec 2018 21:29:45 -0500
Subject: [PATCH] bump version & update changelog

---
 CHANGELOG              | 9 +++++++++
 waterbutler/version.py | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 37fdfd1bb..0e0d22ac8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,15 @@
 ChangeLog
 *********
 
+18.0.1 (2018-12-12)
+===================
+- Fix: Restore the `filename` parameter to WaterButler's Content-Disposition headers.  It had been
+removed in favor of `filename*`, which can correctly encode multibyte filenames.  This broke scripts
+that expected the `filename` version.  Since `filename` cannot support multibyte characters, those
+characters are converted to their nearest ascii equivalent or stripped if no equivalent exists.  WB
+now returns both forms of the parameter in the header.  Clients should prefer `filename*` for the
+most accurate representation of the filename.  (thanks, @jcohenadad!)
+
 18.0.0 (2018-10-31)
 ===================
 - UPDATE: WaterButler is now following the CalVer (https://calver.org/) versioning scheme to match
diff --git a/waterbutler/version.py b/waterbutler/version.py
index 1902fe6f9..0c6e893f6 100644
--- a/waterbutler/version.py
+++ b/waterbutler/version.py
@@ -1 +1 @@
-__version__ = '18.0.0'
+__version__ = '18.0.1'