Merge branch 'release-1.1.0' into releases
authorDan Vanderkam <danvdk@gmail.com>
Wed, 3 Dec 2014 22:15:08 +0000 (17:15 -0500)
committerDan Vanderkam <danvdk@gmail.com>
Wed, 3 Dec 2014 22:15:08 +0000 (17:15 -0500)

Trivial merge