Merge branch 'release/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 9 Jul 2018 17:38:59 +0000 (13:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 9 Jul 2018 17:38:59 +0000 (13:38 -0400)

Trivial merge