Re-commit in applesingle
7 files changed