Merging with master. Keeping this as a branch is silly.