Merge branch 'python' into erick
Merge branch 'python' into erick
major documentation rebuild
Merge branch 'erick' into python