some more variables documented
Merge branch 'master' into copy-count

merge from master
.