Merge down master

[bjester]

Merge master -> hotfixes

[codecov]

Codecov Report

Merging #3046 (5a2eef7) into hotfixes (28587f8) will increase coverage by 4.91%.
The diff coverage is 92.92%.

@@ Coverage Diff @@## hotfixes #3046 +/- ##
============================================
+ Coverage 80.80% 85.71% +4.91% 
============================================
Files 281 298 +17 Lines 12659 15878 +3219 ============================================
+ Hits 10229 13610 +3381 + Misses 2430 2268 -162 

Impacted Files	Coverage Δ
contentcuration/contentcuration/decorators.py	56.60% <50.00%> (-37.60%)	⬇️
...ntentcuration/contentcuration/db/models/manager.py	91.20% <90.98%> (-8.80%)	⬇️
contentcuration/contentcuration/forms.py	82.35% <94.04%> (+33.89%)	⬆️
contentcuration/contentcuration/api.py	92.06% <100.00%> (+1.43%)	⬆️
...tentcuration/contentcuration/context_processors.py	100.00% <100.00%> (ø)
...ontentcuration/contentcuration/db/advisory_lock.py	100.00% <100.00%> (ø)
...tcuration/contentcuration/db/models/expressions.py	93.33% <100.00%> (-6.67%)	⬇️
...entcuration/contentcuration/db/models/functions.py	100.00% <100.00%> (ø)
...ation/contentcuration/tests/test_rest_framework.py	36.93% <0.00%> (-63.07%)	⬇️
contentcuration/contentcuration/utils/format.py	21.05% <0.00%> (-49.54%)	⬇️
... and 181 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8e7a524...5a2eef7. Read the comment docs.

[rtibbles]

I had forgotten about this extra change - hopefully the circular merges will not cause any issues :/