Merge tag 'v2.8.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Nov 2016 19:07:54 +0000 (14:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Nov 2016 19:07:54 +0000 (14:07 -0500)
Version 2.8.4


Trivial merge