Update notes for submitted changes

* Merge branch 'stable/folsom' into master