Merge from 3.2 . Replace the term members with correct  and appropriate terminology. Initial patch by Adam Woodbeck.