Merge branch 'hotfix/1.0.30' v1.0.30
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Sep 2014 16:34:51 +0000 (12:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Sep 2014 16:34:51 +0000 (12:34 -0400)

Trivial merge