Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 2 Feb 2018 16:05:09 +0000 (11:05 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 2 Feb 2018 16:05:09 +0000 (11:05 -0500)

Trivial merge