Merge branch 'hotfix/1.2.12' v1.2.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 3 Oct 2016 12:32:18 +0000 (08:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 3 Oct 2016 12:32:18 +0000 (08:32 -0400)

Trivial merge