Merge branch 'hotfix/1.2.4'
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 17:52:02 +0000 (13:52 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 17:52:02 +0000 (13:52 -0400)

Trivial merge