Merge branch 'hotfix/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:46:54 +0000 (08:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:46:54 +0000 (08:46 -0400)

Trivial merge