Merge branch 'hotfix/1.0.38' v1.0.38
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:26:06 +0000 (11:26 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:26:06 +0000 (11:26 -0500)

Trivial merge