Merge tag 'v1.2.26' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 20:15:35 +0000 (16:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 20:15:35 +0000 (16:15 -0400)
Version 1.2.26


Trivial merge