Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 23 May 2018 18:24:25 +0000 (14:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 23 May 2018 18:24:25 +0000 (14:24 -0400)

Trivial merge