Merge remote-tracking branch 'origin/feature/9907_update_idf_schema'
re #10245 add r to property strings containing backslashes
Merge branch 'feature/10245_python_history_file_paths' into develop