Merge branch 'hotfix/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 15:21:06 +0000 (11:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 15:21:06 +0000 (11:21 -0400)

Trivial merge