Merge branch 'hotfix/1.2.13' v1.2.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 19:41:07 +0000 (15:41 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 19:41:07 +0000 (15:41 -0400)

Trivial merge