Merge branch 'release/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Aug 2018 20:57:38 +0000 (16:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Aug 2018 20:57:38 +0000 (16:57 -0400)

Trivial merge