Version 2.17.6
Merge branch 'upstream_master' into dev # Conflicts: # docs/src/markdown/about/contributing.md # docs/src/markdown/installation.md # readme.md
Merge branch 'upstream_master' into dev # Conflicts: # docs/src/markdown/about/contributing.md # docs/src/markdown/installation.md # readme.md