Merge branch 'release/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:29:48 +0000 (11:29 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:29:48 +0000 (11:29 -0400)

Trivial merge