Merge branch 'release/1.7.17' v1.7.17
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 24 Jan 2019 16:03:50 +0000 (11:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 24 Jan 2019 16:03:50 +0000 (11:03 -0500)

Trivial merge