Merge branch 'release/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Aug 2016 11:48:47 +0000 (07:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Aug 2016 11:48:47 +0000 (07:48 -0400)

Trivial merge