Merge so that iimarckus does less work

Here's how to make iimarckus happy.