Merge branch 'hotfix/1.2.12'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 20:16:49 +0000 (16:16 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 20:16:49 +0000 (16:16 -0400)

Trivial merge