minor corrections/improvements
Merge remote-tracking branch 'origin/gplus' into gplus