Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 23 Mar 2018 15:13:08 +0000 (11:13 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 23 Mar 2018 15:13:08 +0000 (11:13 -0400)

Trivial merge