Merge from upstream #1

Closed nonlin-lin-chaos-order-etc-etal closed 3 years ago