Merge branch 'release/1.6.37' v1.6.37
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 19:56:53 +0000 (15:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 19:56:53 +0000 (15:56 -0400)

Trivial merge