Merge branch 'release/2.8.1' v2.8.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 25 Oct 2016 20:30:38 +0000 (16:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 25 Oct 2016 20:30:38 +0000 (16:30 -0400)

Trivial merge