Merge branch 'release/1.1.7' v1.1.7
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jun 2018 15:26:43 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jun 2018 15:26:43 +0000 (11:26 -0400)

Trivial merge