Merge branch 'hotfix/1.0.22'
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 19:28:07 +0000 (15:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 19:28:07 +0000 (15:28 -0400)

Trivial merge