Fixes only

Слиты xottab-duty запросил слияние github/fork/revolucas/fixes_only в dev

Created by: revolucas

A few minor things from my 'Fixes only' branch