Fix bugs in privateness display.
Merge branch 'master' into theme-ajax