Merge branch 'release/2.8.5' v2.8.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Jan 2017 19:12:19 +0000 (14:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Jan 2017 19:12:19 +0000 (14:12 -0500)

Trivial merge