Merge tag 'v1.2.26' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:10:21 +0000 (12:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:10:21 +0000 (12:10 -0400)
Version 1.2.26


Trivial merge