Typing error
Merge pull request #1120 from Mouchh/patch-1

Typing error
Merge branch 'branch4.0'