Update notes for submitted changes

* Merge remote-tracking branch 'origin/stable/folsom' into upmerge