Merge tag 'v1.5.26' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Sep 2016 12:25:28 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Sep 2016 12:25:28 +0000 (08:25 -0400)
Version 1.5.26


Trivial merge