Merge branch 'release/1.6.58' v1.6.58
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 21 Aug 2017 13:00:20 +0000 (09:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 21 Aug 2017 13:00:20 +0000 (09:00 -0400)

Trivial merge