Manually apply pull #300 (fixes #295) [ci skip]
4 files changed