Merge branch 'rsalz-docfixes'