Merge branch 'release/2.8.2' v2.8.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Oct 2016 16:22:00 +0000 (12:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Oct 2016 16:22:00 +0000 (12:22 -0400)

Trivial merge