Merge branch 'hotfix/1.2.5' v1.2.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 15 Aug 2016 20:14:04 +0000 (16:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 15 Aug 2016 20:14:04 +0000 (16:14 -0400)

Trivial merge