Staging

Only the most recent commit, 0eb311a, is relevant; the other two are merge commits.