fix keywords
Merge branch 'hotfix-0.13.4'