Merge branch 'hotfix/1.2.10' v1.2.10
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 18 May 2017 17:14:43 +0000 (13:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 18 May 2017 17:14:43 +0000 (13:14 -0400)

Trivial merge