Merge branch 'hotfix/1.0.23' v1.0.23
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Apr 2016 13:36:05 +0000 (09:36 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Apr 2016 13:36:05 +0000 (09:36 -0400)

Trivial merge