backport bugfixes from upstream
Michal Toman • 9 years ago