Cascade merge 2.5 into master

Created by: ens-bwalts

Requirements

• Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion;
• Review the development guidelines for eHive; remember in particular:
  • Do not modify code without testing for regression.
  • Provide simple unit tests to test the changes.
  • If you change the database schema, please follow the instructions for schema changes in the developer guidelines.
  • If you change the schema, meadow, or guest language interfaces, please follow the scheme for internal versioning in the developer guidelines.
  • The PR must not fail unit testing.

Use case

Merge version/2.5 fix PR #92 into master

Description

See PR #92

Possible Drawbacks

Testing

Readthedocs rendering works on 2.5

If so, do the tests pass/fail?

Yes