checkpoint
Merge branch 'master' into davisagli-docs
more fixes