Update stable

cc @fh — Looks _gut_ to you?