Commit 0206ff80 authored by BlueWhite's avatar BlueWhite

Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	README.md
parents 946fe8d5 859271ce
Pipeline #7781 passed with stage
in 12 seconds