Merge branch 'hotfix/1.0.36' v1.0.36
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:21:15 +0000 (11:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:21:15 +0000 (11:21 -0500)
commit69d9661c10803243dd38815ac984ead2f61d0585
treec3ae6f88e9a58a23928c4d0bf5acbdbfc4e2966a
parentbe103e24c489188010de9497efa84243914789c4
parentdf10afdf5fc4ae1bf5daf986d4e3e2522bb1608a
Merge branch 'hotfix/1.0.36'