Merge branch 'release/1.7.4' v1.7.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Oct 2018 12:25:56 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Oct 2018 12:25:56 +0000 (08:25 -0400)

Trivial merge