changes from lynda
Merge branch 'client-revisions-r3'