Develop → master for julia 6

Merged Miroslav Kratochvil requested to merge develop into master

Merge request reports