Merge branch 'release/2.6.0' v2.6.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Sep 2016 17:34:47 +0000 (13:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Sep 2016 17:34:47 +0000 (13:34 -0400)

Trivial merge