Merge branch 'master', tag '1.1.13'

1.1.13 release
Merge remote-tracking branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'upstream/master'
correct mistake of comment, fix #1920
Merge pull request #1926 from francistm/issue-1920

fix Issue 1920
[ci skip]