Merged r990394 to the 1.5 branch.
2 files changed