Merge branch 'hotfix/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 3 Feb 2017 19:12:23 +0000 (14:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 3 Feb 2017 19:12:23 +0000 (14:12 -0500)
commitf0439f9f4e7ede806f3cdb2ee98520b75aa87ef0
treefa650b178f574541ee6ce2c03a10ba1da6f7a01f
parente348de2e173120bbd427f0703317d0d44c298878
parent7db0eb7b433051d9d3d4d50c0c2be83d8163a720
Merge branch 'hotfix/1.5.4'