Thanks, Ondrej.  Merged without CHANGES note.