Merge tag 'v1.6.26' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 18:17:53 +0000 (14:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 18:17:53 +0000 (14:17 -0400)
Version 1.6.26


Trivial merge