Merge branch 'hotfix/1.0.17' v1.0.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Mar 2018 15:17:19 +0000 (11:17 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Mar 2018 15:17:19 +0000 (11:17 -0400)

Trivial merge