Merge branch 'hotfix/1.1.31' v1.1.31
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Sep 2014 18:53:32 +0000 (14:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Sep 2014 18:53:32 +0000 (14:53 -0400)

Trivial merge