Merge branch 'hotfix/1.2.26' v1.2.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Feb 2018 14:58:12 +0000 (09:58 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Feb 2018 14:58:12 +0000 (09:58 -0500)
commit40971a953f3433de6010b71db5e16ea0bdd57da9
treedeef06411cfce89526dbf66fb3161d4446d5365b
parentf97148750dcdc3f1e7d0352c3aef82a04bbef532
parentd757844d88f9de7fd91005497713334323d15dc6
Merge branch 'hotfix/1.2.26'