Merge branch 'hotfix/1.5.7' v1.5.7
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Feb 2017 20:19:04 +0000 (15:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Feb 2017 20:19:04 +0000 (15:19 -0500)
commit89753c4126164d6745e38544fbcade331b5a1d4e
treed7fe1313de6be1338689a6b2b3cadeff639ae770
parentd29dc0673467eed72aae3e4228525773ddfa6f49
parent5187cc20b07567aad81b13606f1935689044f224
Merge branch 'hotfix/1.5.7'