Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade javamelody-core to 1.85.0

Change-Id: Ie20fa97c9358a5cd494ad87d8a4dc56c7ec9a406