updated for 4.1
Merge branch 'master' into 4.1
Merge branch 'master' into 4.1
Merge branch 'master' into 4.1
Merge branch 'master' into 4.1
Merge branch 'master' into 4.1
removed type hint