Merge with the stable branch
2 files changed