Merge changes

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