Merge branch 'hotfix/1.5.7' v1.5.7
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:24:53 +0000 (11:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:24:53 +0000 (11:24 -0500)
commitf2bd6121e1ae0e704977d093ba4ed16bead96567
treeeac340c1dade29de31a7a448e8d3a77bfd714e87
parent7a1bd2e2d2be7256c0fec28672ce94d67d146349
parent63f721384db1baa84c9f2bcd88ff2f43e52add6d
Merge branch 'hotfix/1.5.7'