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

.travis.yml

@@ -37,7 +37,9 @@ notifications:
     on_failure: always
   slack:
     rooms:
+      # coregithub
       - secure: gL6s4PRts/S293qOTVDFub8i7DWxqXVpDz5il8Vx7LxSYgOiA9AJcbT1zuXxhfONA5RwXJ62gRze0LllDcAS9TiUl199SSq7x+hBMBKzGxWV5I0P6m5aPMRi2vdC4yiATMQYF97PaH3zWobEDiGEHRAS+mkGNBExXY1hwZSasy8=
+      # ehive-commits
       - secure: XUShBwss607RlWDQyn4tkVDX390+aIXv1ntaUzr9MtsXMpCNm5X/7PPle7Cq6FZ57vHzkIOM0+FM3kIou7vbc3ediwHEv9/o8PwDah7xH46/ukjCsI+labR6jxoX8YX9SRvUUm4FV9Vo2gkWi0IYM+k+VI6AyDFyhEzyJOIGHEY=
     on_failure: change