Merge branch 'hotfix/1.2.10' v1.2.10
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 30 Sep 2016 20:32:53 +0000 (16:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 30 Sep 2016 20:32:53 +0000 (16:32 -0400)

Trivial merge