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

Trivial merge