Changes from master

This is what changed in master.