Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 12:54:17 +0000 (07:54 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 12:54:17 +0000 (07:54 -0500)

Trivial merge