Update release with lastest of master

Yes, master.