wpmu/maera — pull request #35 by aristath (2014-08-31 08:34:08+00:00)
Title: 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