Merge branch 'hotfix/1.0.37' v1.0.37
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Oct 2016 17:21:23 +0000 (13:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Oct 2016 17:21:23 +0000 (13:21 -0400)

Trivial merge