Merge branch 'hotfix/1.1.32' v1.1.32
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Oct 2014 13:14:48 +0000 (09:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Oct 2014 13:14:48 +0000 (09:14 -0400)

Trivial merge