Release 4.1

Merge 4.1 changes into master.