A bunch of unmerged commits from my fork.