Merge tag 'v2.8.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Jan 2017 19:12:30 +0000 (14:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Jan 2017 19:12:30 +0000 (14:12 -0500)
Version 2.8.5


Trivial merge