Pull latest changes from 'master'

This commit is contained in:
Absurdon 2020-10-11 19:57:51 +02:00
commit 269a1de5d7