Merge happiness and Foundation branches with master.
Pull from upstream master.