Merge branch 'hotfix/1.0.39' v1.0.39
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 May 2017 18:55:35 +0000 (14:55 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 May 2017 18:55:35 +0000 (14:55 -0400)

Trivial merge