tweaks
Merge remote-tracking branch 'upstream/master'
Worked on user documentation some more.