NOJIRA: Merge master into PIP

To everything
(merge, merge, merge)
There is a season
(merge, merge, merge)