Merge branch 'hotfix/1.2.40' v1.2.40
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 13:44:12 +0000 (09:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 13:44:12 +0000 (09:44 -0400)

Trivial merge