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

Trivial merge