Merge branch 'hotfix/1.5.26' v1.5.26
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Sep 2016 12:25:20 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Sep 2016 12:25:20 +0000 (08:25 -0400)
commitb243a872cf69799edf78bb8ab776ed06e0079626
tree2c821fe9697ae51f72cc4acf4cddd2a735722501
parent234978bdaf07388e376e8efb724dbf1589b50a64
parentd137d68403b5976150d4e92293432feaba6bdc99
Merge branch 'hotfix/1.5.26'