Merge branch 'hotfix/1.0.38' v1.0.38
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 May 2017 18:49:34 +0000 (14:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 May 2017 18:49:34 +0000 (14:49 -0400)

Trivial merge