This PR has a merge conflict, so I manually added it in 0f169ac.
Pull-Request has been closed by bcotton