Merge branch 'hotfix/2.6.2' v2.6.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Oct 2016 19:37:05 +0000 (15:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Oct 2016 19:37:05 +0000 (15:37 -0400)

Trivial merge