beginnings of bug 6195
Merge branch 'master' into pinauthintegration