Merge branch 'hotfix/1.0.23' v1.0.23
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Feb 2017 19:10:46 +0000 (14:10 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Feb 2017 19:10:46 +0000 (14:10 -0500)

Trivial merge