[pypy-dev] Merge request for branch/force-arch-darwin