Merge branch 'release/1.7.5' v1.7.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Nov 2018 16:23:27 +0000 (11:23 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Nov 2018 16:23:27 +0000 (11:23 -0500)

Trivial merge