Merge request containing all other merge requests targeted for 3.1

@flux this branch only needs your release magic
@msapiro do you mind testing this branch on your deployment? I'm running this branch on my production server and didn't find an issue yet.

Fixes #26 (closed), #3 (closed), #131 (closed), #161 (closed), #90 (closed)

Includes code from !199 (closed), !182 (closed), !180 (closed), !153 (closed), !135 (closed), !190 (closed)