Merge branch 'hotfix/1.1.26' v1.1.26
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Jul 2017 16:26:44 +0000 (12:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Jul 2017 16:26:44 +0000 (12:26 -0400)
commitbff868c9b6fe5d32b147c5695f23cb582371512e
treefadf1e4e1e49361a1bfc9553db27568f5973b012
parentd2c74e52b9f6785f578ac4414b4030744c1dd950
parentd8377939e08715d94a97769b0c611bd5fcaa88db
Merge branch 'hotfix/1.1.26'