Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 17:00:13 +0000 (13:00 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 17:00:13 +0000 (13:00 -0400)

Trivial merge