Update from stable branch.
3 files changed