diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1779018f..474fca7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
   dataset_organization, resource_url_upload, resource_format_autocomplete,
   select presets
 
+
 ## 1.0.0
 
 2015-10-14
@@ -23,3 +24,20 @@
 * new presets: multiple_checkbox, multiple_select, date
 * support for yaml schemas+presets
 * lots of fixes
+
+
+## 1.1.0
+
+2017-10-05
+
+* automated tests against ckan 2.4, 2.5 and 2.6
+* json_object field preset for arbitrary JSON objects as values
+* datetime and datetime_tz field presets for date+time validation
+* display_snippet=null to hide fields from being displayed
+* choices_helper option to use a helper function for custom choice lists
+* scheming_datastore_choices helper for pulling choice lists from a
+  DataStore table
+* select_size option to customize select form snippet
+* sorted_choices option to sort choices before displaying them
+* automatic reloading on schema changes in development mode
+* improved test coverage and lots of fixes
diff --git a/ckanext/scheming/helpers.py b/ckanext/scheming/helpers.py
index 4d7254fb..9ca45b68 100644
--- a/ckanext/scheming/helpers.py
+++ b/ckanext/scheming/helpers.py
@@ -27,6 +27,7 @@ def scheming_language_text(text, prefer_lang=None):
     if not text:
         return u''
 
+    assert text != {}
     if hasattr(text, 'get'):
         try:
             if prefer_lang is None:
diff --git a/setup.py b/setup.py
index f3648dee..5720c0ef 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '1.0.1b'
+version = '1.1.0'
 
 setup(
     name='ckanext-scheming',