Actual merge

Couldn't merge changes the other way.