Merge branch 'release/1.6.80' v1.6.80
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Apr 2018 18:47:32 +0000 (14:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Apr 2018 18:47:32 +0000 (14:47 -0400)

Trivial merge