Merge tag 'v1.6.9' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:56:55 +0000 (14:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:56:55 +0000 (14:56 -0500)
Version 1.6.9


Trivial merge