Merge tag 'v1.6.96' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Aug 2018 12:23:36 +0000 (08:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Aug 2018 12:23:36 +0000 (08:23 -0400)
Version 1.6.96


Trivial merge