tested up to 4.1
Merge branch 'master' into release