Merge tag 'v2.8.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Oct 2016 16:22:07 +0000 (12:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Oct 2016 16:22:07 +0000 (12:22 -0400)
Version 2.8.2


Trivial merge