2.5.0

.. using staging repository
Merge branch 'core' into biodiversity