Merge branch 'hotfix/1.0.22' v1.0.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Feb 2017 18:09:46 +0000 (13:09 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Feb 2017 18:09:46 +0000 (13:09 -0500)

Trivial merge