Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Feb 2018 21:43:19 +0000 (16:43 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Feb 2018 21:43:19 +0000 (16:43 -0500)

Trivial merge