Merge branch 'release/1.6.83' v1.6.83
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 May 2018 20:17:41 +0000 (16:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 May 2018 20:17:41 +0000 (16:17 -0400)

Trivial merge