Merge the latest master

I just merged and fixed the latest master.