Merge remote-tracking branch 'origin/feature/7965_update_QLines_ws_format'
Merge branch 'master', remote-tracking branch 'origin' into feature/7966_jumpfit_fortran_with_fit
Refs #7966 refactored JumpFit code.
Merge branch 'feature/7966_jumpfit_fortran_with_fit' into develop