Merge changes

Hi. You're about 104 commits behind. Import this please.