Merge branch 'hotfix/1.6.42' v1.6.42
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jun 2017 12:33:59 +0000 (08:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jun 2017 12:33:59 +0000 (08:33 -0400)
commitb4e452f0f4544ee872b2378fb148564b9010a814
treef68f35b9f7fecf50116d50fbbce4c690a5edf58e
parent283b2b18f3d72200f95f122e46fa687abd11f5aa
parent843a4da4b65da2ddce088335fe1c67890dee39cb
Merge branch 'hotfix/1.6.42'