Merge branch 'hotfix/1.5.6' v1.5.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 19:10:14 +0000 (14:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 19:10:14 +0000 (14:10 -0500)
commitd29dc0673467eed72aae3e4228525773ddfa6f49
treedad3474a4af05646c8dc32ee8006fa1ebb141e38
parentd51b580598ce9e6a6e3fac864641081df6dac9d8
parent9de019afeb6de328b95c1c8f85f7780709d9f7a8
Merge branch 'hotfix/1.5.6'