Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 17 Jul 2017 16:12:50 +0000 (12:12 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 17 Jul 2017 16:12:50 +0000 (12:12 -0400)

Trivial merge