Update from stable branch.
2 files changed