Merge branch 'hotfix/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Mar 2016 15:30:25 +0000 (11:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Mar 2016 15:30:25 +0000 (11:30 -0400)

Trivial merge