Merge tag 'v1.6.80' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Apr 2018 18:47:41 +0000 (14:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Apr 2018 18:47:41 +0000 (14:47 -0400)
Version 1.6.80


Trivial merge