Merge tag 'v1.6.69' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Oct 2017 16:22:17 +0000 (12:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Oct 2017 16:22:17 +0000 (12:22 -0400)
Version 1.6.69


Trivial merge