Merge branch 'hotfix/1.0.23' v1.0.23
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Mar 2016 12:56:00 +0000 (08:56 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Mar 2016 12:56:00 +0000 (08:56 -0400)

Trivial merge