Merge branch 'release/1.6.38' v1.6.38
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 17 May 2017 15:47:50 +0000 (11:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 17 May 2017 15:47:50 +0000 (11:47 -0400)

Trivial merge