Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 20:29:41 +0000 (16:29 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 20:29:41 +0000 (16:29 -0400)

Trivial merge