[ci skip] Polish changes from pull #1709
2 files changed