Manually merged upstream update
Manually merged upstream update

ericagol/celerite,dfm/celerite,ericagol/GenRP,ericagol/GenRP,ericagol/celerite,ericagol/celerite,ericagol/GenRP,dfm/celerite,dfm/celerite