Merge branch 's' into 'master'

s

See merge request docker/git-rsync-from-openwrt!4