snapshot-9 - added better checking for nonauthenticated
Merge branch 'snapshot-9' into snapshot-10
snapshot-10 - removed extra whitespace after merge