Merge branch 'release/2.6.1' v2.6.1
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 22 Sep 2016 21:03:21 +0000 (17:03 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 22 Sep 2016 21:03:21 +0000 (17:03 -0400)

Trivial merge