Merge branch 'release/1.1.1' v1.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Sep 2017 17:23:36 +0000 (13:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Sep 2017 17:23:36 +0000 (13:23 -0400)

Trivial merge