Merge branch 'hotfix/1.0.22' v1.0.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 19:42:05 +0000 (15:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 19:42:05 +0000 (15:42 -0400)

Trivial merge