backport bugfixes from upstream
Michal Toman • 8 years ago