Merge branch 'release/1.0.17' master v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Dec 2018 15:34:59 +0000 (10:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Dec 2018 15:34:59 +0000 (10:34 -0500)

Trivial merge