Merged without CHANGES note.  Applied to master as well for consistency.