Merge branch 'release-1.1.1' into releases releases
authorDan Vanderkam <danvdk@gmail.com>
Mon, 1 Jun 2015 21:17:10 +0000 (14:17 -0700)
committerDan Vanderkam <danvdk@gmail.com>
Mon, 1 Jun 2015 21:17:10 +0000 (14:17 -0700)

Trivial merge