Merge branch 'release/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 18 Jul 2017 19:41:58 +0000 (15:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 18 Jul 2017 19:41:58 +0000 (15:41 -0400)

Trivial merge