Merge release into master

(everything manually)