Merger for https://github.com/wpmu/maera/pull/34

This is just a helper branch that resolves conflicts with this PR: https://github.com/wpmu/maera/pull/34