merge from master, resolving a bit of a conflict

this branch already had failing tests, no new ones fail at least :P