Mere mistress into master

See the open issue for an explanation