Merge branch 'stable' back into master

For #155, I cherry-picked a few commits into stable, which caused stable to diverge from master. This merge brings them back together.
gelisam · May 20, 2016 · d2df7ae · d2df7ae
2 parents 5d87ae3 + ee4c1f6
commit d2df7ae
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # What's new?
 
+## New in 1.1.2
+
+[Stack](http://www.haskellstack.org) compatibility.
+
 ## New in 1.1.1
 
 GHC 7.10 compatibility.