updating for the 4.1 release
Merge remote-tracking branch 'origin/master'