Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 6 Mar 2018 15:15:52 +0000 (10:15 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 6 Mar 2018 15:15:52 +0000 (10:15 -0500)

Trivial merge