Merge branch 'hotfix/1.0.22' v1.0.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:32:41 +0000 (11:32 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:32:41 +0000 (11:32 -0500)

Trivial merge