Merge branch 'hotfix/1.0.23' v1.0.23
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 24 Oct 2016 20:09:24 +0000 (16:09 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 24 Oct 2016 20:09:24 +0000 (16:09 -0400)

Trivial merge