Merge branch 'release/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 4 Jun 2018 15:35:08 +0000 (11:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 4 Jun 2018 15:35:08 +0000 (11:35 -0400)

Trivial merge