Merge branch 'hotfix/1.0.17' v1.0.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 15 Mar 2018 16:36:34 +0000 (12:36 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 15 Mar 2018 16:36:34 +0000 (12:36 -0400)

Trivial merge