Merge tag 'v1.6.42' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jun 2017 12:34:07 +0000 (08:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jun 2017 12:34:07 +0000 (08:34 -0400)
Version 1.6.42


Trivial merge