Merge branch 'master' into python_config
Merge branch 'master' into python_config
#795: config.py, further define schema docblocks
Merge branch 'master' into python_config
Merge branch 'python_config' manually, since cannot merge pull request