Merge branch 'hotfix/1.2.37' v1.2.37
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:53:06 +0000 (08:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:53:06 +0000 (08:53 -0400)

Trivial merge