Merge branch 'release/1.0.17' v1.0.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 28 Sep 2018 15:22:17 +0000 (11:22 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 28 Sep 2018 15:22:17 +0000 (11:22 -0400)

Trivial merge