Merge branch 'hotfix/1.5.9' v1.5.9
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 20:39:06 +0000 (15:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 20:39:06 +0000 (15:39 -0500)
commit56655735cee2d4225b0c5cb034cc259cef2d4286
treedf5248a84788eff3d5e4c98092e7c12dee612140
parent6cd5141b9fa02ca5e79a6742c6d12345dabcc0ab
parent1d4a1b8fd78e0932f74d49602a2df8da417cca62
Merge branch 'hotfix/1.5.9'