Merge branch 'hotfix/1.5.6' v1.5.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:21:07 +0000 (11:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:21:07 +0000 (11:21 -0500)
commit7a1bd2e2d2be7256c0fec28672ce94d67d146349
treee499fb7cbb2d806792b3fcbd8e88ee6e0711f9f0
parent2258706b179966533b27b4cb45bda6b947086a49
parent166d4cdf3a874dd97fcdedb5eb9a01fe57608483
Merge branch 'hotfix/1.5.6'