Merge branch 'hotfix/1.0.37' v1.0.37
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:24:28 +0000 (11:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:24:28 +0000 (11:24 -0500)

Trivial merge