Updates for 4.1.1. version.
Merge branch 'develop'